diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcf60215d..21a2b696a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ See for more information about XPrivacy 3 [this FAQ](https://github.com/M66B/XPr
 **Next release**
 
 * Show parameter to *getPackagesForUid*/*Srv_getPackagesForUid*
+* Fixed renaming long template names ([issue](/../../issues/2052))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
diff --git a/res/layout/template.xml b/res/layout/template.xml
index b05001940..34d919725 100644
--- a/res/layout/template.xml
+++ b/res/layout/template.xml
@@ -15,8 +15,9 @@
 
         <Spinner
             android:id="@+id/spTemplate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
 
         <Button
             android:id="@+id/btnRename"