diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favourite_edit_dialog.xml
index 11614f7abf..d2fcd8c292 100644
--- a/OsmAnd/res/layout/favourite_edit_dialog.xml
+++ b/OsmAnd/res/layout/favourite_edit_dialog.xml
@@ -6,12 +6,12 @@
   	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" 
   			android:text="@string/favourites_edit_dialog_name"/>
   	<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
-  			android:id="@+id/Name"/>
+  			android:id="@+id/Name" android:inputType="textCapWords" android:selectAllOnFocus="true"/>
   </TableRow>
   <TableRow>
   	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" 
   			android:text="@string/favourites_edit_dialog_category"/>
   	<AutoCompleteTextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
-  		android:id="@+id/Category" android:completionThreshold="1"/>
+  		android:id="@+id/Category" android:completionThreshold="1" android:inputType="textCapWords" android:selectAllOnFocus="true"/>
   </TableRow>
 </TableLayout>