diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index 2d7c6f8a8e..5f49add309 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -452,14 +452,12 @@ Gui::MenuItem* Workbench::setupMenuBar() const
           << "Separator"
           << "Part_CheckGeometry"
           << "Separator"
+          << "PartDesign_InvoluteGear"
           << "PartDesign_Sprocket";
 
     // For 0.13 a couple of python packages like numpy, matplotlib and others
     // are not deployed with the installer on Windows. Thus, the WizardShaft is
     // not deployed either hence the check for the existence of the command.
-    if (Gui::Application::Instance->commandManager().getCommandByName("PartDesign_InvoluteGear")) {
-        *part << "PartDesign_InvoluteGear";
-    }
     if (Gui::Application::Instance->commandManager().getCommandByName("PartDesign_WizardShaft")) {
         *part << "Separator" << "PartDesign_WizardShaft";
     }
diff --git a/src/Mod/PartDesign/InitGui.py b/src/Mod/PartDesign/InitGui.py
index a2adb62196..13af01b55c 100644
--- a/src/Mod/PartDesign/InitGui.py
+++ b/src/Mod/PartDesign/InitGui.py
@@ -50,15 +50,12 @@ class PartDesignWorkbench ( Workbench ):
 
         import PartDesignGui
         import PartDesign
-        try:
-            from PartDesign import InvoluteGearFeature
-            from PartDesign import SprocketFeature
-        except ImportError:
-            print("Involute gear module cannot be loaded")
-            #try:
-            #    from FeatureHole import HoleGui
-            #except:
-            #    pass
+
+        from PartDesign.InvoluteGearFeature import CommandInvoluteGear
+        Gui.addCommand('PartDesign_InvoluteGear', CommandInvoluteGear())
+
+        from PartDesign.SprocketFeature import CommandSprocket
+        FreeCADGui.addCommand('PartDesign_Sprocket', CommandSprocket())
 
     def GetClassName(self):
         return "PartDesignGui::Workbench"
diff --git a/src/Mod/PartDesign/InvoluteGearFeature.py b/src/Mod/PartDesign/InvoluteGearFeature.py
index e2d3e44051..8f88a2bb36 100644
--- a/src/Mod/PartDesign/InvoluteGearFeature.py
+++ b/src/Mod/PartDesign/InvoluteGearFeature.py
@@ -51,7 +51,7 @@ def makeInvoluteGear(name):
     return obj
 
 
-class _CommandInvoluteGear:
+class CommandInvoluteGear:
     "GUI command to create an InvoluteGear"
     def GetResources(self):
         return {'Pixmap'  : 'PartDesign_InternalExternalGear',
@@ -277,7 +277,3 @@ class _InvoluteGearTaskPanel:
     def reject(self):
         FreeCADGui.ActiveDocument.resetEdit()
         FreeCAD.ActiveDocument.abortTransaction()
-
-
-if FreeCAD.GuiUp:
-    FreeCADGui.addCommand('PartDesign_InvoluteGear',_CommandInvoluteGear())
diff --git a/src/Mod/PartDesign/SprocketFeature.py b/src/Mod/PartDesign/SprocketFeature.py
index 609d6c4218..626e597e58 100644
--- a/src/Mod/PartDesign/SprocketFeature.py
+++ b/src/Mod/PartDesign/SprocketFeature.py
@@ -332,7 +332,3 @@ class SprocketTaskPanel:
         FreeCAD.ActiveDocument.recompute()
         FreeCADGui.ActiveDocument.resetEdit()
         FreeCAD.ActiveDocument.abortTransaction()
-
-
-if FreeCAD.GuiUp:
-    FreeCADGui.addCommand('PartDesign_Sprocket', CommandSprocket())