diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 69c88b5b67..be8990d108 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -2105,13 +2105,8 @@ class ShapeString(Creator):
 #---------------------------------------------------------------------------
 # Modifier functions
 #---------------------------------------------------------------------------
+from draftguitools.gui_base_original import Modifier
 
-class Modifier(DraftTool):
-    """A generic Modifier Tool, used by modification tools such as move"""
-
-    def __init__(self):
-        DraftTool.__init__(self)
-        self.copymode = False
 
 class Move(Modifier):
     """The Draft_Move FreeCAD command definition"""
diff --git a/src/Mod/Draft/draftguitools/gui_base_original.py b/src/Mod/Draft/draftguitools/gui_base_original.py
index c0bc6aa968..654eab44a5 100644
--- a/src/Mod/Draft/draftguitools/gui_base_original.py
+++ b/src/Mod/Draft/draftguitools/gui_base_original.py
@@ -285,3 +285,18 @@ class Creator(DraftTool):
         super().Activated(name, noplanesetup)
         if not noplanesetup:
             self.support = gui_tool_utils.get_support()
+
+
+class Modifier(DraftTool):
+    """A generic Modifier tool, used by modification tools such as move.
+
+    After initializing the parent class, it sets the `copymode` attribute
+    to `False`.
+
+    It inherits `DraftTool`, which sets up the majority of the behavior
+    of this class.
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.copymode = False