diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3ce30ca..8134e75e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ and this project somewhat adheres to [Semantic Versioning](https://semver.org/sp
 - Fix map connections getting cut off in exported map images if they're on the same side as another short map connection.
 - Fix the project version check failing for some versions of `git`.
 - Fix some error highlights persisting after the error is resolved.
+- Fix the Layout/Tileset labels on the `Metatiles` panel disappearing if the panel is too narrow.
 
 ## [6.2.0] - 2025-08-08
 ### Added
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index c6b6931e..d650bdef 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -1114,6 +1114,9 @@
                           <property name="editable">
                            <bool>true</bool>
                           </property>
+                          <property name="minimumContentsLength">
+                           <number>0</number>
+                          </property>
                          </widget>
                         </item>
                         <item row="2" column="0">
@@ -1134,35 +1137,24 @@
                           <property name="editable">
                            <bool>true</bool>
                           </property>
-                         </widget>
-                        </item>
-                        <item row="0" column="0">
-                         <widget class="QFrame" name="frame_LayoutSelection">
-                          <property name="frameShape">
-                           <enum>QFrame::Shape::NoFrame</enum>
+                          <property name="minimumContentsLength">
+                           <number>0</number>
                           </property>
-                          <property name="frameShadow">
-                           <enum>QFrame::Shadow::Raised</enum>
-                          </property>
-                          <layout class="QFormLayout" name="formLayout_3">
-                           <property name="topMargin">
-                            <number>2</number>
-                           </property>
-                           <property name="bottomMargin">
-                            <number>2</number>
-                           </property>
-                           <item row="0" column="0">
-                            <widget class="QLabel" name="label_Layout">
-                             <property name="text">
-                              <string>Layout</string>
-                             </property>
-                            </widget>
-                           </item>
-                          </layout>
                          </widget>
                         </item>
                         <item row="0" column="1">
-                         <widget class="NoScrollComboBox" name="comboBox_LayoutSelector"/>
+                         <widget class="NoScrollComboBox" name="comboBox_LayoutSelector">
+                          <property name="minimumContentsLength">
+                           <number>0</number>
+                          </property>
+                         </widget>
+                        </item>
+                        <item row="0" column="0">
+                         <widget class="QLabel" name="label_Layout">
+                          <property name="text">
+                           <string>Layout</string>
+                          </property>
+                         </widget>
                         </item>
                        </layout>
                       </widget>
@@ -3243,12 +3235,12 @@
    </property>
   </action>
   <action name="actionDuplicate_Current_Map">
-   <property name="text">
-    <string>Duplicate Current Map...</string>
-   </property>
    <property name="enabled">
     <bool>false</bool>
    </property>
+   <property name="text">
+    <string>Duplicate Current Map...</string>
+   </property>
   </action>
   <action name="actionDuplicate_Current_Layout">
    <property name="text">