diff --git a/mapeditor/inspector/armywidget.cpp b/mapeditor/inspector/armywidget.cpp
index fcba00cf0..cadd580f3 100644
--- a/mapeditor/inspector/armywidget.cpp
+++ b/mapeditor/inspector/armywidget.cpp
@@ -40,6 +40,9 @@ ArmyWidget::ArmyWidget(CArmedInstance & a, QWidget *parent) :
 			uiSlots[i]->insertItem(c + 1, creature->getNamePluralTranslated().c_str());
 			uiSlots[i]->setItemData(c + 1, creature->getIndex());
 		}
+
+		uiSlots[i]->completer()->setCompletionMode(QCompleter::PopupCompletion);
+		uiSlots[i]->completer()->setFilterMode(Qt::MatchContains);
 	}
 	
 	ui->formationTight->setChecked(true);
diff --git a/mapeditor/inspector/armywidget.ui b/mapeditor/inspector/armywidget.ui
index a6a512393..d442388cd 100644
--- a/mapeditor/inspector/armywidget.ui
+++ b/mapeditor/inspector/armywidget.ui
@@ -34,6 +34,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="3" column="0">
@@ -44,6 +47,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="6" column="0">
@@ -54,6 +60,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="2" column="0">
@@ -64,6 +73,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="4" column="0">
@@ -74,6 +86,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="0" column="0">
@@ -84,6 +99,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">
@@ -94,6 +112,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="8" column="0">