diff --git a/po/POTFILES.in b/po/POTFILES.in
index d3fbf45a3..90441fc8b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,7 +20,6 @@ src/Spell.py
 src/ToolTips.py
 src/TransUtils.py
 src/Utils.py
-src/UndoHistory.py
 
 # cli
 src/cli/arghandler.py
@@ -342,6 +341,7 @@ src/gui/grampsbar.py
 src/gui/grampsgui.py
 src/gui/makefilter.py
 src/gui/tipofday.py
+src/gui/undohistory.py
 src/gui/utils.py
 src/gui/viewmanager.py
 
diff --git a/src/Makefile.am b/src/Makefile.am
index efb53d155..5b3e1a790 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,6 @@ gdir_PYTHON = \
 	TransUtils.py\
 	TreeTips.py\
 	Utils.py\
-	UndoHistory.py\
 	PlaceUtils.py
 
 # Clean up all the byte-compiled files
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index bc40dd60e..6a007cd9c 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -36,6 +36,7 @@ pkgpython_PYTHON = \
 	navigator.py \
 	pluginmanager.py \
 	tipofday.py \
+	undohistory.py \
 	user.py \
 	utils.py \
 	viewmanager.py
diff --git a/src/UndoHistory.py b/src/gui/undohistory.py
similarity index 100%
rename from src/UndoHistory.py
rename to src/gui/undohistory.py
diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py
index fd7ee8998..0feec2931 100644
--- a/src/gui/viewmanager.py
+++ b/src/gui/viewmanager.py
@@ -85,7 +85,7 @@ import Errors
 from QuestionDialog import (ErrorDialog, WarningDialog, QuestionDialog2,
                             InfoDialog)
 from gui import widgets
-import UndoHistory
+from gui.undohistory import UndoHistory
 import Utils
 from gui.dbloader import DbLoader
 import GrampsDisplay
@@ -1699,8 +1699,7 @@ class ViewManager(CLIManager):
         Displays the Undo history window
         """
         try:
-            self.undo_history_window = UndoHistory.UndoHistory(self.dbstate,
-                                                               self.uistate)
+            self.undo_history_window = UndoHistory(self.dbstate, self.uistate)
         except Errors.WindowActiveError:
             return