diff --git a/po/POTFILES.in b/po/POTFILES.in
index 25a65e8d5..ee6dae9c3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -367,6 +367,7 @@ src/gui/editors/editprimary.py
 src/gui/editors/editreporef.py
 src/gui/editors/editrepository.py
 src/gui/editors/editsource.py
+src/gui/editors/edittaglist.py
 src/gui/editors/editurl.py
 
 # gui/editors/displaytabs - the GUI display tabs package
@@ -473,7 +474,6 @@ src/gui/widgets/monitoredwidgets.py
 src/gui/widgets/photo.py
 src/gui/widgets/progressdialog.py
 src/gui/widgets/styledtexteditor.py
-src/gui/widgets/tageditor.py
 src/gui/widgets/undoableentry.py
 src/gui/widgets/validatedmaskedentry.py
 
diff --git a/src/gui/editors/Makefile.am b/src/gui/editors/Makefile.am
index d368f6f0e..fa5843df8 100644
--- a/src/gui/editors/Makefile.am
+++ b/src/gui/editors/Makefile.am
@@ -36,6 +36,7 @@ pkgpython_PYTHON = \
 	editreporef.py \
 	editsecondary.py \
 	editsource.py \
+	edittaglist.py \
 	editurl.py \
 	objectentries.py
 
diff --git a/src/gui/editors/__init__.py b/src/gui/editors/__init__.py
index ea887c7df..3495b1bf0 100644
--- a/src/gui/editors/__init__.py
+++ b/src/gui/editors/__init__.py
@@ -42,6 +42,7 @@ from editplace import EditPlace, DeletePlaceQuery
 from editrepository import EditRepository, DeleteRepositoryQuery
 from editreporef import EditRepoRef
 from editsource import EditSource, DeleteSrcQuery
+from edittaglist import EditTagList
 from editurl import EditUrl
 from editlink import EditLink
 
diff --git a/src/gui/widgets/tageditor.py b/src/gui/editors/edittaglist.py
similarity index 98%
rename from src/gui/widgets/tageditor.py
rename to src/gui/editors/edittaglist.py
index f262fe49e..4cc39955e 100644
--- a/src/gui/widgets/tageditor.py
+++ b/src/gui/editors/edittaglist.py
@@ -50,10 +50,10 @@ WIKI_HELP_SEC = _('manual|Tags')
 
 #-------------------------------------------------------------------------
 #
-# TagEditor
+# EditTagList
 #
 #-------------------------------------------------------------------------
-class TagEditor(ManagedWindow):
+class EditTagList(ManagedWindow):
     """
     Dialog to allow the user to edit a list of tags.
     """
diff --git a/src/gui/widgets/Makefile.am b/src/gui/widgets/Makefile.am
index b7eac321a..a7143f890 100644
--- a/src/gui/widgets/Makefile.am
+++ b/src/gui/widgets/Makefile.am
@@ -24,7 +24,6 @@ pkgpython_PYTHON = \
 	statusbar.py \
 	styledtextbuffer.py \
 	styledtexteditor.py \
-	tageditor.py \
 	toolcomboentry.py \
 	undoablebuffer.py \
 	undoableentry.py \
diff --git a/src/gui/widgets/monitoredwidgets.py b/src/gui/widgets/monitoredwidgets.py
index a99b29ae2..522653016 100644
--- a/src/gui/widgets/monitoredwidgets.py
+++ b/src/gui/widgets/monitoredwidgets.py
@@ -52,7 +52,6 @@ import pango
 #-------------------------------------------------------------------------
 from gen.ggettext import gettext as _
 import AutoComp
-from gui.widgets.tageditor import TagEditor
 import gen.datehandler
 from gen.lib.date import Date, NextYear
 from gen.errors import ValidationError
@@ -860,8 +859,9 @@ class MonitoredTagList(object):
         if (event.type == gtk.gdk.BUTTON_PRESS or
            (event.type == gtk.gdk.KEY_PRESS and
             event.keyval in (_RETURN, _KP_ENTER))):
-            editor = TagEditor(self.tag_list, self.all_tags,
-                               self.uistate, self.track)
+            from gui.editors import EditTagList
+            editor = EditTagList(self.tag_list, self.all_tags,
+                                 self.uistate, self.track)
             if editor.return_list is not None:
                 self.tag_list = editor.return_list
                 self._display()