diff --git a/mscore/resourceManager.cpp b/mscore/resourceManager.cpp
index 2bf49f92ce..97fc943cf7 100644
--- a/mscore/resourceManager.cpp
+++ b/mscore/resourceManager.cpp
@@ -33,8 +33,8 @@ ResourceManager::ResourceManager(QWidget *parent) :
       displayLanguages();
       languagesTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
       languagesTable->verticalHeader()->hide();
-      tabs->removeTab(1);
-      tabs->setCurrentIndex(0);
+      tabs->removeTab(tabs->indexOf(plugins));
+      tabs->setCurrentIndex(tabs->indexOf(languages));
       }
 
 void ResourceManager::displayPlugins()
diff --git a/mscore/stafftext.ui b/mscore/stafftext.ui
index a832e6b8a3..4cee30bdd7 100644
--- a/mscore/stafftext.ui
+++ b/mscore/stafftext.ui
@@ -22,7 +22,7 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab_1">
+     <widget class="QWidget" name="tabChangeChannel">
       <attribute name="title">
        <string>Change Channel</string>
       </attribute>
@@ -262,7 +262,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2">
+     <widget class="QWidget" name="tabMIDIAction">
       <attribute name="title">
        <string>MIDI Action</string>
       </attribute>
@@ -346,7 +346,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3">
+     <widget class="QWidget" name="tabAeolusStops">
       <attribute name="title">
        <string>Aeolus Stops</string>
       </attribute>
@@ -3995,7 +3995,7 @@ VI</string>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_4">
+     <widget class="QWidget" name="tabSwingSettings">
       <attribute name="title">
        <string>Swing Settings</string>
       </attribute>
diff --git a/mscore/stafftextproperties.cpp b/mscore/stafftextproperties.cpp
index 8695d1c968..af8e3c700d 100644
--- a/mscore/stafftextproperties.cpp
+++ b/mscore/stafftextproperties.cpp
@@ -54,17 +54,17 @@ StaffTextProperties::StaffTextProperties(const StaffText* st, QWidget* parent)
       setupUi(this);
       if (st->systemFlag()) {
             setWindowTitle(tr("MuseScore: System Text Properties"));
-            tabWidget->removeTab(2); // Aeolus settings  for staff text only
-            //if (!enableExperimental) tabWidget->removeTab(1); // MIDI action
-            tabWidget->removeTab(0); // Channel switching  for staff text only
+            tabWidget->removeTab(tabWidget->indexOf(tabAeolusStops)); // Aeolus settings  for staff text only
+            //if (!enableExperimental) tabWidget->removeTab(tabWidget->indexOf(tabMIDIAction));
+            tabWidget->removeTab(tabWidget->indexOf(tabChangeChannel)); // Channel switching  for staff text only
             }
       else {
             setWindowTitle(tr("MuseScore: Staff Text Properties"));
-            //tabWidget->removeTab(3); // Swing settings for system text only, could be disabled here, if desired
+            //tabWidget->removeTab(tabWidget->indexOf(tabSwingSettings)); // Swing settings for system text only, could be disabled here, if desired
 #ifndef AEOLUS
-            tabWidget->removeTab(2);
+            tabWidget->removeTab(tabWidget->indexOf(tabAeolusStops));
 #endif
-            //if (!enableExperimental) tabWidget->removeTab(1); // MIDI action
+            //if (!enableExperimental) tabWidget->removeTab(tabWidget->indexOf(tabMIDIAction));
             }
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       _staffText = static_cast<StaffText*>(st->clone());