diff --git a/qt-ui/divecomponentselection.ui b/qt-ui/divecomponentselection.ui
index 644a1fef2..dbd0839ba 100644
--- a/qt-ui/divecomponentselection.ui
+++ b/qt-ui/divecomponentselection.ui
@@ -61,13 +61,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="cylinders">
-        <property name="text">
-         <string>Cylinders</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="0">
        <widget class="QCheckBox" name="divemaster">
         <property name="text">
@@ -75,13 +68,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="weights">
-        <property name="text">
-         <string>Weights</string>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="0">
        <widget class="QCheckBox" name="buddy">
         <property name="text">
@@ -110,6 +96,27 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="tags">
+        <property name="text">
+         <string>Tags</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="weights">
+        <property name="text">
+         <string>Weights</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="cylinders">
+        <property name="text">
+         <string>Cylinders</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp
index b0b900fe4..772c8d1b9 100644
--- a/qt-ui/simplewidgets.cpp
+++ b/qt-ui/simplewidgets.cpp
@@ -428,6 +428,7 @@ DiveComponentSelection::DiveComponentSelection(QWidget *parent, struct dive *tar
 	UI_FROM_COMPONENT(visibility);
 	UI_FROM_COMPONENT(notes);
 	UI_FROM_COMPONENT(suit);
+	UI_FROM_COMPONENT(tags);
 	UI_FROM_COMPONENT(cylinders);
 	UI_FROM_COMPONENT(weights);
 	connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *)));
@@ -448,6 +449,7 @@ void DiveComponentSelection::buttonClicked(QAbstractButton *button)
 		COMPONENT_FROM_UI(visibility);
 		COMPONENT_FROM_UI(notes);
 		COMPONENT_FROM_UI(suit);
+		COMPONENT_FROM_UI(tags);
 		COMPONENT_FROM_UI(cylinders);
 		COMPONENT_FROM_UI(weights);
 		selective_copy_dive(&displayed_dive, targetDive, *what, true);