diff --git a/res/combobox_background.xml b/res/combobox_background.xml
new file mode 100644
index 00000000..f9bedd80
--- /dev/null
+++ b/res/combobox_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/btn_pressed" />
+    <item android:state_focused="true" android:state_default="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_default" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_default" />
+    <item android:state_enabled="true" android:state_default="true"
+        android:drawable="@drawable/btn_default" />
+    <item android:state_enabled="true" android:state_hovered="true"
+        android:drawable="@drawable/btn_hover" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_normal" />
+    <item
+        android:drawable="@drawable/btn_disabled" />
+</selector>
+
diff --git a/res/mdpi/editbox_background_disabled_focus.9.png b/res/mdpi/editbox_background_disabled_focus.9.png
index f1b87259..ddfc4bb7 100644
Binary files a/res/mdpi/editbox_background_disabled_focus.9.png and b/res/mdpi/editbox_background_disabled_focus.9.png differ
diff --git a/res/mdpi/editbox_background_disabled_focus_yellow.9.png b/res/mdpi/editbox_background_disabled_focus_yellow.9.png
deleted file mode 100644
index f9039977..00000000
Binary files a/res/mdpi/editbox_background_disabled_focus_yellow.9.png and /dev/null differ
diff --git a/res/mdpi/editbox_background_focus.9.png b/res/mdpi/editbox_background_focus.9.png
index c83fa6f7..30929e17 100644
Binary files a/res/mdpi/editbox_background_focus.9.png and b/res/mdpi/editbox_background_focus.9.png differ
diff --git a/res/mdpi/editbox_background_focus_yellow.9.png b/res/mdpi/editbox_background_focus_yellow.9.png
deleted file mode 100644
index faf52ede..00000000
Binary files a/res/mdpi/editbox_background_focus_yellow.9.png and /dev/null differ
diff --git a/res/theme_default.xml b/res/theme_default.xml
index ed4d0416..0db58e07 100644
--- a/res/theme_default.xml
+++ b/res/theme_default.xml
@@ -183,7 +183,7 @@
         />
 
     <style id="COMBO_BOX"
-        backgroundImageId="btn_background"
+        backgroundImageId="combobox_background"
         padding="2,2,2,2"
         margins="2,2,2,2"
         minWidth="40"
diff --git a/src/dlangui/widgets/combobox.d b/src/dlangui/widgets/combobox.d
index 442bd133..50677c46 100644
--- a/src/dlangui/widgets/combobox.d
+++ b/src/dlangui/widgets/combobox.d
@@ -144,6 +144,8 @@ class ComboBoxBase : HorizontalLayout, OnClickHandler {
         //_body.state = State.Parent;
         //focusable = true;
         _button.focusable = false;
+        _body.focusable = false;
+        focusable = true;
         //_body.focusable = true;
         addChild(_body);
         addChild(_button);
@@ -276,8 +278,8 @@ class ComboEdit : ComboBox {
 
 	override void init() {
 		super.init();
-		focusable = false;
-		_body.focusable = true;
+		//focusable = false;
+		//_body.focusable = true;
 	}
 
 }
diff --git a/src/dlangui/widgets/editors.d b/src/dlangui/widgets/editors.d
index a262f9c2..812d381b 100644
--- a/src/dlangui/widgets/editors.d
+++ b/src/dlangui/widgets/editors.d
@@ -926,6 +926,13 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
 		return true;
 	}
 
+    /// returns true if widget is focusable and visible and enabled
+    override @property bool canFocus() {
+        // allow to focus even if not enabled
+        return focusable && visible;
+    }
+
+
 	/// override to change popup menu items state
 	override bool isActionEnabled(const Action action) {
 		switch (action.id) {