diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index adf3240bbb..63d4b8ad0f 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -104,6 +104,7 @@ SET(FemSolver_SRCS
     femsolver/run.py
     femsolver/settings.py
     femsolver/signal.py
+    femsolver/solver_taskpanel.py
     femsolver/solverbase.py
     femsolver/task.py
     femsolver/writerbase.py
@@ -319,7 +320,6 @@ INSTALL(FILES ${FemObjectsScripts_SRCS} DESTINATION Mod/Fem/femobjects)
 # Python Gui packages and modules
 SET(FemGuiScripts_SRCS
     femguiobjects/__init__.py
-    femguiobjects/_TaskPanelFemSolverControl.py
     femguiobjects/_ViewProviderFemConstraintBodyHeatSource.py
     femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py
     femguiobjects/_ViewProviderFemConstraintFlowVelocity.py
diff --git a/src/Mod/Fem/femguiobjects/_TaskPanelFemSolverControl.py b/src/Mod/Fem/femsolver/solver_taskpanel.py
similarity index 100%
rename from src/Mod/Fem/femguiobjects/_TaskPanelFemSolverControl.py
rename to src/Mod/Fem/femsolver/solver_taskpanel.py
diff --git a/src/Mod/Fem/femsolver/solverbase.py b/src/Mod/Fem/femsolver/solverbase.py
index 9f95848c74..b1452bd695 100644
--- a/src/Mod/Fem/femsolver/solverbase.py
+++ b/src/Mod/Fem/femsolver/solverbase.py
@@ -39,7 +39,7 @@ from femtools.errors import DirectoryDoesNotExistError
 if App.GuiUp:
     from PySide import QtGui
     import FreeCADGui as Gui
-    from femguiobjects import _TaskPanelFemSolverControl
+    from . import solverbase
 
 
 class Proxy(object):
@@ -105,7 +105,7 @@ class ViewProxy(object):
                 error_message
             )
             return False
-        task = _TaskPanelFemSolverControl.ControlTaskPanel(machine)
+        task = solverbase.ControlTaskPanel(machine)
         Gui.Control.showDialog(task)
         return True