diff --git a/picard/ui/ui_edittagdialog.py b/picard/ui/ui_edittagdialog.py
new file mode 100644
index 000000000..8fb6b0cf4
--- /dev/null
+++ b/picard/ui/ui_edittagdialog.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'ui/edittagdialog.ui'
+#
+# Created: Sat Dec 23 13:51:18 2006
+#      by: PyQt4 UI code generator 4.1
+#
+# WARNING! All changes made in this file will be lost!
+
+import sys
+from PyQt4 import QtCore, QtGui
+
+class Ui_EditTagDialog(object):
+    def setupUi(self, EditTagDialog):
+        EditTagDialog.setObjectName("EditTagDialog")
+        EditTagDialog.resize(QtCore.QSize(QtCore.QRect(0,0,384,225).size()).expandedTo(EditTagDialog.minimumSizeHint()))
+
+        self.vboxlayout = QtGui.QVBoxLayout(EditTagDialog)
+        self.vboxlayout.setMargin(9)
+        self.vboxlayout.setSpacing(6)
+        self.vboxlayout.setObjectName("vboxlayout")
+
+        self.hboxlayout = QtGui.QHBoxLayout()
+        self.hboxlayout.setMargin(0)
+        self.hboxlayout.setSpacing(6)
+        self.hboxlayout.setObjectName("hboxlayout")
+
+        self.name = QtGui.QComboBox(EditTagDialog)
+        self.name.setObjectName("name")
+        self.hboxlayout.addWidget(self.name)
+
+        self.desc = QtGui.QLineEdit(EditTagDialog)
+        self.desc.setObjectName("desc")
+        self.hboxlayout.addWidget(self.desc)
+        self.vboxlayout.addLayout(self.hboxlayout)
+
+        self.value = QtGui.QTextEdit(EditTagDialog)
+        self.value.setTabChangesFocus(True)
+        self.value.setAcceptRichText(False)
+        self.value.setObjectName("value")
+        self.vboxlayout.addWidget(self.value)
+
+        self.hboxlayout1 = QtGui.QHBoxLayout()
+        self.hboxlayout1.setMargin(0)
+        self.hboxlayout1.setSpacing(6)
+        self.hboxlayout1.setObjectName("hboxlayout1")
+
+        spacerItem = QtGui.QSpacerItem(131,31,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        self.hboxlayout1.addItem(spacerItem)
+
+        self.okButton = QtGui.QPushButton(EditTagDialog)
+        self.okButton.setDefault(True)
+        self.okButton.setObjectName("okButton")
+        self.hboxlayout1.addWidget(self.okButton)
+
+        self.cancelButton = QtGui.QPushButton(EditTagDialog)
+        self.cancelButton.setObjectName("cancelButton")
+        self.hboxlayout1.addWidget(self.cancelButton)
+        self.vboxlayout.addLayout(self.hboxlayout1)
+
+        self.retranslateUi(EditTagDialog)
+        QtCore.QObject.connect(self.okButton,QtCore.SIGNAL("clicked()"),EditTagDialog.accept)
+        QtCore.QObject.connect(self.cancelButton,QtCore.SIGNAL("clicked()"),EditTagDialog.reject)
+        QtCore.QMetaObject.connectSlotsByName(EditTagDialog)
+
+    def retranslateUi(self, EditTagDialog):
+        EditTagDialog.setWindowTitle(_(u"Edit Tag"))
+        self.okButton.setText(_(u"OK"))
+        self.cancelButton.setText(_(u"Cancel"))
+
diff --git a/ui/edittagdialog.ui b/ui/edittagdialog.ui
new file mode 100644
index 000000000..d3a53f466
--- /dev/null
+++ b/ui/edittagdialog.ui
@@ -0,0 +1,125 @@
+<ui version="4.0" >
+ <class>EditTagDialog</class>
+ <widget class="QDialog" name="EditTagDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>384</width>
+    <height>225</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Edit Tag</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QComboBox" name="name" />
+     </item>
+     <item>
+      <widget class="QLineEdit" name="desc" />
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTextEdit" name="value" >
+     <property name="tabChangesFocus" >
+      <bool>true</bool>
+     </property>
+     <property name="acceptRichText" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>131</width>
+         <height>31</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>
+   <receiver>EditTagDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>196</x>
+     <y>200</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>108</x>
+     <y>189</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>EditTagDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>275</x>
+     <y>199</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>275</x>
+     <y>217</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>