diff --git a/OsmAnd/res/layout/favorite_edit_dialog.xml b/OsmAnd/res/layout/favorite_edit_dialog.xml
index c591527713..e080008d5a 100644
--- a/OsmAnd/res/layout/favorite_edit_dialog.xml
+++ b/OsmAnd/res/layout/favorite_edit_dialog.xml
@@ -31,11 +31,10 @@
 			android:layout_marginTop="@dimen/dialog_elements_vertical_margin"
 			android:text="@string/favourites_edit_dialog_category"/>
 
-		<AutoCompleteTextView
+		<net.osmand.plus.widgets.AutoCompleteTextViewEx
 			android:id="@+id/Category"
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:completionThreshold="1"/>
+			android:layout_height="wrap_content"/>
 
 		<TextView
 			android:layout_width="wrap_content"
diff --git a/OsmAnd/src/net/osmand/plus/widgets/AutoCompleteTextViewEx.java b/OsmAnd/src/net/osmand/plus/widgets/AutoCompleteTextViewEx.java
new file mode 100644
index 0000000000..0f516ff137
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/widgets/AutoCompleteTextViewEx.java
@@ -0,0 +1,41 @@
+package net.osmand.plus.widgets;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Rect;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.widget.AutoCompleteTextView;
+
+public class AutoCompleteTextViewEx extends AutoCompleteTextView {
+	public AutoCompleteTextViewEx(Context context) {
+		super(context);
+	}
+
+	public AutoCompleteTextViewEx(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public AutoCompleteTextViewEx(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public AutoCompleteTextViewEx(Context context, AttributeSet attrs, int defStyleAttr,
+								  int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
+
+	@Override
+	public boolean enoughToFilter() {
+		return true;
+	}
+
+	@Override
+	protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+		super.onFocusChanged(focused, direction, previouslyFocusedRect);
+		if (focused && getAdapter() != null) {
+			performFiltering(getText(), 0);
+		}
+	}
+}