diff --git a/mscore/editstaff.cpp b/mscore/editstaff.cpp
index c31f23b62c45..3a537f27d574 100644
--- a/mscore/editstaff.cpp
+++ b/mscore/editstaff.cpp
@@ -274,6 +274,7 @@ void EditStaff::showInstrumentDialog()
       if (si.exec()) {
             instrument = Instrument::fromTemplate(si.instrTemplate());
             updateInstrument();
+            fillStaffTypeCombo();
             }
       }
 
diff --git a/mscore/editstaff.ui b/mscore/editstaff.ui
index ea65ef0e9c4d..606d0b79fecf 100644
--- a/mscore/editstaff.ui
+++ b/mscore/editstaff.ui
@@ -589,7 +589,14 @@
        </widget>
       </item>
       <item row="0" column="5">
-       <widget class="QComboBox" name="staffType"/>
+       <widget class="QComboBox" name="staffType">
+        <property name="maxVisibleItems">
+         <number>16</number>
+        </property>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToContents</enum>
+        </property>
+       </widget>
       </item>
       <item row="0" column="4">
        <widget class="QLabel" name="label_12">
@@ -633,6 +640,9 @@
       </item>
       <item row="1" column="5">
        <widget class="QDoubleSpinBox" name="spinExtraDistance">
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
         <property name="suffix">
          <string>sp</string>
         </property>