diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 6e3aeec80..8cdf6de88 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -69,6 +69,7 @@ MainWindow::MainWindow() : QMainWindow(),
 	Q_ASSERT_X(m_Instance == NULL, "MainWindow", "MainWindow recreated!");
 	m_Instance = this;
 	ui.setupUi(this);
+	ui.tagFilter->hide();
 	profileToolbarActions << ui.profCalcAllTissues << ui.profCalcCeiling << ui.profDcCeiling << ui.profEad <<
 		    ui.profHR << ui.profIncrement3m << ui.profMod << ui.profNdl_tts << ui.profNdl_tts <<
 		    ui.profPhe << ui.profPn2 << ui.profPO2 << ui.profRuler << ui.profSAC << ui.profScaled <<
@@ -1327,3 +1328,8 @@ void MainWindow::on_paste_triggered()
 	selective_copy_dive(&copyPasteDive, &displayed_dive, what, false);
 	ui.InfoWidget->showAndTriggerEditSelective(what);
 }
+
+void MainWindow::on_actionFilterTags_triggered()
+{
+	ui.tagFilter->show();
+}
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 1ae717a34..270d907b6 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -146,7 +146,7 @@ slots:
 	void on_actionExport_triggered();
 	void on_copy_triggered();
 	void on_paste_triggered();
-
+	void on_actionFilterTags_triggered();
 	void on_actionConfigure_Dive_Computer_triggered();
 
 protected:
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index c1580af06..44bd6291b 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -163,7 +163,7 @@
           </item>
          </layout>
         </widget>
-	<widget class="QWidget" name="page_5">
+        <widget class="QWidget" name="page_5">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
@@ -296,6 +296,7 @@ p, li { white-space: pre-wrap; }
     <addaction name="actionAutoGroup"/>
     <addaction name="separator"/>
     <addaction name="actionEditDeviceNames"/>
+    <addaction name="actionFilterTags"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -838,6 +839,11 @@ p, li { white-space: pre-wrap; }
     <string>Toggle Tank Bar</string>
    </property>
   </action>
+  <action name="actionFilterTags">
+   <property name="text">
+    <string>Filter by Tags</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>