diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 8aa623ee..1f215f3d 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -1932,7 +1932,7 @@
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="QComboBox" name="comboBox_Song">
+             <widget class="NoScrollComboBox" name="comboBox_Song">
               <property name="toolTip">
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default background music for this map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
@@ -1949,7 +1949,7 @@
              </widget>
             </item>
             <item row="1" column="1">
-             <widget class="QComboBox" name="comboBox_Location">
+             <widget class="NoScrollComboBox" name="comboBox_Location">
               <property name="toolTip">
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The section of the region map which the map is grouped under. This also determines the name of the map that is display when the player enters it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
@@ -1983,7 +1983,7 @@
              </widget>
             </item>
             <item row="3" column="1">
-             <widget class="QComboBox" name="comboBox_Weather">
+             <widget class="NoScrollComboBox" name="comboBox_Weather">
               <property name="toolTip">
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default weather for this map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
@@ -2000,7 +2000,7 @@
              </widget>
             </item>
             <item row="4" column="1">
-             <widget class="QComboBox" name="comboBox_Type">
+             <widget class="NoScrollComboBox" name="comboBox_Type">
               <property name="toolTip">
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
@@ -2017,7 +2017,7 @@
              </widget>
             </item>
             <item row="6" column="1">
-             <widget class="QComboBox" name="comboBox_BattleScene">
+             <widget class="NoScrollComboBox" name="comboBox_BattleScene">
               <property name="toolTip">
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Determines the type of battle scene graphics to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
@@ -2419,7 +2419,7 @@
                 </widget>
                </item>
                <item>
-                <widget class="QComboBox" name="comboBox_ConnectedMap">
+                <widget class="NoScrollComboBox" name="comboBox_ConnectedMap">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The destination map name of the connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
@@ -2449,7 +2449,7 @@
                 </widget>
                </item>
                <item>
-                <widget class="QComboBox" name="comboBox_ConnectionDirection">
+                <widget class="NoScrollComboBox" name="comboBox_ConnectionDirection">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The direction of the connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
@@ -2643,7 +2643,7 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QComboBox" name="comboBox_DiveMap">
+                   <widget class="NoScrollComboBox" name="comboBox_DiveMap">
                     <property name="toolTip">
                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Destination map name when using &lt;span style=&quot; font-weight:600;&quot;&gt;Dive&lt;/span&gt;. If empty, no such connection will exist.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                     </property>
@@ -2660,7 +2660,7 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QComboBox" name="comboBox_EmergeMap">
+                   <widget class="NoScrollComboBox" name="comboBox_EmergeMap">
                     <property name="toolTip">
                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Destination map name when emerging using &lt;span style=&quot; font-weight:600;&quot;&gt;Dive&lt;/span&gt;. If empty, no such connection will exist.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                     </property>
diff --git a/forms/mapimageexporter.ui b/forms/mapimageexporter.ui
index d82ce2fa..c25f6cad 100644
--- a/forms/mapimageexporter.ui
+++ b/forms/mapimageexporter.ui
@@ -131,7 +131,7 @@
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="QComboBox" name="comboBox_MapSelection">
+        <widget class="NoScrollComboBox" name="comboBox_MapSelection">
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>
          </property>
diff --git a/forms/newmappopup.ui b/forms/newmappopup.ui
index 9cab8872..209c078d 100644
--- a/forms/newmappopup.ui
+++ b/forms/newmappopup.ui
@@ -61,7 +61,7 @@
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="QComboBox" name="comboBox_NewMap_Group">
+        <widget class="NoScrollComboBox" name="comboBox_NewMap_Group">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;New map group.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
@@ -146,7 +146,7 @@
         </widget>
        </item>
        <item row="6" column="1">
-        <widget class="QComboBox" name="comboBox_NewMap_Type">
+        <widget class="NoScrollComboBox" name="comboBox_NewMap_Type">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
@@ -163,7 +163,7 @@
         </widget>
        </item>
        <item row="7" column="1">
-        <widget class="QComboBox" name="comboBox_NewMap_Location">
+        <widget class="NoScrollComboBox" name="comboBox_NewMap_Location">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The section of the region map which the map is grouped under. This also determines the name of the map that is displayed when the player enters it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
diff --git a/forms/regionmapeditor.ui b/forms/regionmapeditor.ui
index 7396b5db..e793f19f 100644
--- a/forms/regionmapeditor.ui
+++ b/forms/regionmapeditor.ui
@@ -773,7 +773,7 @@
                 </widget>
                </item>
                <item row="0" column="1">
-                <widget class="QComboBox" name="comboBox_RM_ConnectedMap">
+                <widget class="NoScrollComboBox" name="comboBox_RM_ConnectedMap">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                    <horstretch>0</horstretch>
@@ -809,7 +809,7 @@
                 </widget>
                </item>
                <item row="2" column="1">
-                <widget class="QComboBox" name="comboBox_RM_CityMap">
+                <widget class="NoScrollComboBox" name="comboBox_RM_CityMap">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The map type is a general attribute, which is used for many different things. For example. it determines whether biking or running is allowed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
@@ -887,7 +887,7 @@
                 </widget>
                </item>
                <item row="0" column="1">
-                <widget class="QComboBox" name="comboBox_RM_Entry_MapSection">
+                <widget class="NoScrollComboBox" name="comboBox_RM_Entry_MapSection">
                  <property name="enabled">
                   <bool>true</bool>
                  </property>
@@ -1030,7 +1030,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QComboBox" name="comboBox_CityMap_picker"/>
+            <widget class="NoScrollComboBox" name="comboBox_CityMap_picker"/>
            </item>
            <item>
             <widget class="QPushButton" name="pushButton_CityMap_add">
diff --git a/include/mainwindow.h b/include/mainwindow.h
index 8aae0fed..11a12017 100644
--- a/include/mainwindow.h
+++ b/include/mainwindow.h
@@ -111,11 +111,11 @@ private slots:
 
     void on_comboBox_ConnectionDirection_currentIndexChanged(const QString &arg1);
     void on_spinBox_ConnectionOffset_valueChanged(int offset);
-    void on_comboBox_ConnectedMap_currentTextChanged(const QString &mapName);
+    void on_comboBox_ConnectedMap_activated(const QString &mapName);
     void on_pushButton_AddConnection_clicked();
     void on_pushButton_RemoveConnection_clicked();
-    void on_comboBox_DiveMap_currentTextChanged(const QString &mapName);
-    void on_comboBox_EmergeMap_currentTextChanged(const QString &mapName);
+    void on_comboBox_DiveMap_activated(const QString &mapName);
+    void on_comboBox_EmergeMap_activated(const QString &mapName);
     void on_comboBox_PrimaryTileset_activated(const QString &arg1);
     void on_comboBox_SecondaryTileset_activated(const QString &arg1);
     void on_pushButton_clicked();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9776384b..ddf99da3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1942,7 +1942,7 @@ void MainWindow::on_spinBox_ConnectionOffset_valueChanged(int offset)
     editor->updateConnectionOffset(offset);
 }
 
-void MainWindow::on_comboBox_ConnectedMap_currentTextChanged(const QString &mapName)
+void MainWindow::on_comboBox_ConnectedMap_activated(const QString &mapName)
 {
     editor->setConnectionMap(mapName);
 }
@@ -1957,12 +1957,12 @@ void MainWindow::on_pushButton_RemoveConnection_clicked()
     editor->removeCurrentConnection();
 }
 
-void MainWindow::on_comboBox_DiveMap_currentTextChanged(const QString &mapName)
+void MainWindow::on_comboBox_DiveMap_activated(const QString &mapName)
 {
     editor->updateDiveMap(mapName);
 }
 
-void MainWindow::on_comboBox_EmergeMap_currentTextChanged(const QString &mapName)
+void MainWindow::on_comboBox_EmergeMap_activated(const QString &mapName)
 {
     editor->updateEmergeMap(mapName);
 }