diff --git a/po/POTFILES.in b/po/POTFILES.in
index ee6dae9c3..f0fd97c43 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -333,7 +333,6 @@ src/gui/dbloader.py
 src/gui/dbman.py
 src/gui/dialog.py
 src/gui/displaystate.py
-src/gui/filtereditor.py
 src/gui/grampsbar.py
 src/gui/grampsgui.py
 src/gui/makefilter.py
@@ -369,6 +368,7 @@ src/gui/editors/editrepository.py
 src/gui/editors/editsource.py
 src/gui/editors/edittaglist.py
 src/gui/editors/editurl.py
+src/gui/editors/filtereditor.py
 
 # gui/editors/displaytabs - the GUI display tabs package
 src/gui/editors/displaytabs/addrembedlist.py
diff --git a/src/ExportOptions.py b/src/ExportOptions.py
index df88ff2ac..e7dbf9de3 100644
--- a/src/ExportOptions.py
+++ b/src/ExportOptions.py
@@ -619,7 +619,7 @@ class WriterOptionBox(object):
         Callback which invokes the EditFilter dialog. Will create new
         filter if called if none is selected.
         """
-        from gui.filtereditor import EditFilter
+        from gui.editors import EditFilter
         from gen.filters import FilterList, GenericFilterFactory
         import const
         the_filter = None
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index ac7dadf2a..d36c5748c 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -31,7 +31,6 @@ pkgpython_PYTHON = \
 	dialog.py \
 	display.py \
 	displaystate.py \
-	filtereditor.py \
 	glade.py \
 	grampsbar.py \
 	grampsgui.py \
diff --git a/src/gui/editors/Makefile.am b/src/gui/editors/Makefile.am
index fa5843df8..d386fa1af 100644
--- a/src/gui/editors/Makefile.am
+++ b/src/gui/editors/Makefile.am
@@ -38,6 +38,7 @@ pkgpython_PYTHON = \
 	editsource.py \
 	edittaglist.py \
 	editurl.py \
+	filtereditor.py \
 	objectentries.py
 
 pkgpyexecdir = @pkgpyexecdir@/gui/editors
diff --git a/src/gui/editors/__init__.py b/src/gui/editors/__init__.py
index 3495b1bf0..8d5c3bfc6 100644
--- a/src/gui/editors/__init__.py
+++ b/src/gui/editors/__init__.py
@@ -45,6 +45,7 @@ from editsource import EditSource, DeleteSrcQuery
 from edittaglist import EditTagList
 from editurl import EditUrl
 from editlink import EditLink
+from filtereditor import FilterEditor, EditFilter
 
 # Map from gen.lib name to Editor:
 EDITORS = {
diff --git a/src/gui/filtereditor.py b/src/gui/editors/filtereditor.py
similarity index 100%
rename from src/gui/filtereditor.py
rename to src/gui/editors/filtereditor.py
diff --git a/src/gui/filters/sidebar/_sidebarfilter.py b/src/gui/filters/sidebar/_sidebarfilter.py
index 01d86293d..1d12a7894 100644
--- a/src/gui/filters/sidebar/_sidebarfilter.py
+++ b/src/gui/filters/sidebar/_sidebarfilter.py
@@ -226,7 +226,7 @@ class SidebarFilter(DbGUIElement):
         Callback which invokes the EditFilter dialog. Will create new
         filter if called if none is selected.
         """
-        from gui.filtereditor import EditFilter
+        from gui.editors import EditFilter
         from gen.filters import FilterList, GenericFilterFactory
         import const
         the_filter = None
diff --git a/src/gui/makefilter.py b/src/gui/makefilter.py
index 77edeae91..fdebb9527 100644
--- a/src/gui/makefilter.py
+++ b/src/gui/makefilter.py
@@ -22,7 +22,7 @@
 
 import time
 import gen.filters 
-from gui.filtereditor import EditFilter
+from gui.editors import EditFilter
 import const
 from gen.filters import reload_custom_filters
 from gen.ggettext import sgettext as _
diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py
index 3a7aa417f..ae3d0662b 100644
--- a/src/gui/views/listview.py
+++ b/src/gui/views/listview.py
@@ -61,7 +61,7 @@ from gui.utils import add_menuitem
 import const
 import Utils
 from gui.dialog import QuestionDialog, QuestionDialog2
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 from gen.ggettext import sgettext as _
 from gui.ddtargets import DdTargets
 from gui.plug.quick import create_quickreport_menu, create_web_connect_menu
diff --git a/src/plugins/tool/EventCmp.py b/src/plugins/tool/EventCmp.py
index c16715667..fa4f3b3d5 100644
--- a/src/plugins/tool/EventCmp.py
+++ b/src/plugins/tool/EventCmp.py
@@ -60,7 +60,7 @@ from gui.display import display_help
 from gui.managedwindow import ManagedWindow
 from gen.ggettext import sgettext as _
 from gui.glade import Glade
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/plugins/view/pedigreeview.py b/src/plugins/view/pedigreeview.py
index 42ce5d401..a2bd3dc9a 100644
--- a/src/plugins/view/pedigreeview.py
+++ b/src/plugins/view/pedigreeview.py
@@ -49,7 +49,7 @@ import gtk
 #-------------------------------------------------------------------------
 import gen.lib
 from gui.views.navigationview import NavigationView
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 from gen.display.name import displayer as name_displayer
 from Utils import (media_path_full, probably_alive, find_children, 
                    find_parents, find_witnessed_people)
diff --git a/src/plugins/view/relview.py b/src/plugins/view/relview.py
index 91852f9b1..d6188c89f 100644
--- a/src/plugins/view/relview.py
+++ b/src/plugins/view/relview.py
@@ -50,7 +50,7 @@ import gen.lib
 from gen.db import DbTxn
 from gui.views.navigationview import NavigationView
 from gui.editors import EditPerson, EditFamily
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 from gen.display.name import displayer as name_displayer
 from Utils import media_path_full, probably_alive
 from gui.utils import open_file_with_default_application