diff --git a/po/POTFILES.in b/po/POTFILES.in
index 425a3f937..560ff744e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,6 @@ src/Assistant.py
 src/Bookmarks.py
 src/const.py
 src/DateEdit.py
-src/DisplayState.py
 src/ExportAssistant.py
 src/ExportOptions.py
 src/gramps.py
@@ -338,6 +337,7 @@ src/gui/columnorder.py
 src/gui/configure.py
 src/gui/dbloader.py
 src/gui/dbman.py
+src/gui/displaystate.py
 src/gui/filtereditor.py
 src/gui/grampsbar.py
 src/gui/grampsgui.py
diff --git a/src/Makefile.am b/src/Makefile.am
index 4538179b5..7f3064153 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@ gdir_PYTHON = \
 	DateEdit.py\
 	DbState.py\
 	DdTargets.py\
-	DisplayState.py\
 	Errors.py\
 	ExportAssistant.py\
 	ExportOptions.py\
diff --git a/src/cli/grampscli.py b/src/cli/grampscli.py
index ad3fe747a..274a16ac5 100644
--- a/src/cli/grampscli.py
+++ b/src/cli/grampscli.py
@@ -213,7 +213,7 @@ class CLIManager(object):
         """
         # A recent database should already have a directory If not, do nothing,
         #  just return. This can be handled better if family tree delete/rename
-        #  also updated the recent file menu info in DisplayState.py
+        #  also updated the recent file menu info in displaystate.py
         if not  os.path.isdir(filename):
             self._errordialog(
                     _("Could not load a recent Family Tree."), 
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 002d3a780..25dd837f7 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -26,6 +26,7 @@ pkgpython_PYTHON = \
 	dbguielement.py \
 	dbloader.py \
 	dbman.py \
+	displaystate.py \
 	filtereditor.py \
 	glade.py \
 	grampsbar.py \
diff --git a/src/DisplayState.py b/src/gui/displaystate.py
similarity index 100%
rename from src/DisplayState.py
rename to src/gui/displaystate.py
diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py
index 5aa239a6d..d5d9b439f 100644
--- a/src/gui/viewmanager.py
+++ b/src/gui/viewmanager.py
@@ -77,7 +77,7 @@ from gui.plug.report import report
 from gen.plug.utils import version_str_to_tup, load_addon_file
 from gui.pluginmanager import GuiPluginManager
 import Relationship
-import DisplayState
+from gui.displaystate import DisplayState, RecentDocsMenu
 import const
 import constfunc
 import config
@@ -627,7 +627,7 @@ class ViewManager(CLIManager):
         self.progress_monitor = ProgressMonitor(
             GtkProgressDialog, ("", self.window))
 
-        self.uistate = DisplayState.DisplayState(
+        self.uistate = DisplayState(
             self.window, self.statusbar, self.progress, self.warnbtn,
             self.uimanager, self.progress_monitor, self)
 
@@ -645,7 +645,7 @@ class ViewManager(CLIManager):
         self.uistate.set_open_widget(openbtn)
         self.toolbar.insert(openbtn, 0)
 
-        self.recent_manager = DisplayState.RecentDocsMenu(
+        self.recent_manager = RecentDocsMenu(
             self.uistate, self.dbstate, self._read_recent_file)
         self.recent_manager.build()