diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h
index b41189fe5..1673055c0 100644
--- a/qt-ui/simplewidgets.h
+++ b/qt-ui/simplewidgets.h
@@ -12,6 +12,7 @@ class QAbstractButton;
 #include "ui_shifttimes.h"
 #include "ui_shiftimagetimes.h"
 #include "ui_divecomponentselection.h"
+#include "ui_tagfilter.h"
 #include "exif.h"
 
 class MinMaxAvgWidget : public QWidget {
@@ -126,6 +127,12 @@ private:
 	struct dive_components *what;
 };
 
+class TagFilter : public QWidget {
+	Q_OBJECT
+public:
+	TagFilter(QWidget *parent);
+};
+
 bool isGnome3Session();
 QImage grayImage(const QImage& coloredImg);
 
diff --git a/qt-ui/tagfilter.ui b/qt-ui/tagfilter.ui
new file mode 100644
index 000000000..91078ed82
--- /dev/null
+++ b/qt-ui/tagfilter.ui
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TagFilter</class>
+ <widget class="QWidget" name="TagFilter">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLineEdit" name="filterTag"/>
+   </item>
+   <item>
+    <widget class="QListView" name="tagView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/subsurface.pro b/subsurface.pro
index 63024ceec..1e85b1165 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -221,7 +221,8 @@ FORMS = \
 	qt-ui/plannerSettings.ui \
 	qt-ui/usersurvey.ui \
 	qt-ui/divecomponentselection.ui \
-	qt-ui/configuredivecomputerdialog.ui
+	qt-ui/configuredivecomputerdialog.ui \
+	qt-ui/tagfilter.ui
 
 # Nether usermanual or printing is supported on android right now
 android: FORMS -= qt-ui/printoptions.ui