diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py
index 9d96719da5..f40238bd5a 100644
--- a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py
+++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py
@@ -30,7 +30,7 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD
 import FreeCADGui
-import FemGui
+from . import ViewProviderFemConstraint
 
 # for the panel
 from PySide import QtCore
@@ -45,50 +45,20 @@ if sys.version_info.major >= 3:
         return str(text)
 
 
-class _ViewProviderFemSolverCalculix:
+class _ViewProviderFemSolverCalculix(ViewProviderFemConstraint.ViewProxy):
     "A View Provider for the FemSolverCalculix object"
 
-    def __init__(self, vobj):
-        vobj.Proxy = self
-
     def getIcon(self):
         return ":/icons/fem-solver-standard.svg"
 
-    def attach(self, vobj):
-        self.ViewObject = vobj
-        self.Object = vobj.Object
-
-    def updateData(self, obj, prop):
-        return
-
-    def onChanged(self, vobj, prop):
-        return
-
     def setEdit(self, vobj, mode=0):
-        taskd = _TaskPanelFemSolverCalculix(self.Object)
-        FreeCADGui.Control.showDialog(taskd)
-        return True
-
-    def unsetEdit(self, vobj, mode=0):
-        FreeCADGui.Control.closeDialog()
-        return True
-
-    def doubleClicked(self, vobj):
-        doc = FreeCADGui.getDocument(vobj.Object.Document)
-        if not doc.getInEdit():
-            doc.setEdit(vobj.Object.Name)
-        else:
-            from PySide.QtGui import QMessageBox
-            message = "Active Task Dialog found! Please close this one before opening  a new one!"
-            QMessageBox.critical(None, "Error in tree view", message)
-            FreeCAD.Console.PrintError(message + "\n")
-        return True
-
-    def __getstate__(self):
-        return None
-
-    def __setstate__(self, state):
-        return None
+        ViewProviderFemConstraint.ViewProxy.setEdit(
+            self,
+            vobj,
+            mode,
+            _TaskPanelFemSolverCalculix,
+            hide_mesh=False
+        )
 
 
 class _TaskPanelFemSolverCalculix:
diff --git a/src/Mod/Fem/femobjects/_FemSolverCalculix.py b/src/Mod/Fem/femobjects/_FemSolverCalculix.py
index 999d1b56d6..cca0264e76 100644
--- a/src/Mod/Fem/femobjects/_FemSolverCalculix.py
+++ b/src/Mod/Fem/femobjects/_FemSolverCalculix.py
@@ -30,14 +30,17 @@ __url__ = "http://www.freecadweb.org"
 import FreeCAD
 from femsolver.calculix.solver import ANALYSIS_TYPES
 
+from . import FemConstraint
 
-class _FemSolverCalculix():
+
+class _FemSolverCalculix(FemConstraint.Proxy):
     """The Fem::FemSolver's Proxy python type, add solver specific properties
     """
+
+    Type = "Fem::FemSolverCalculixCcxTools"
+
     def __init__(self, obj):
-        self.Type = "Fem::FemSolverCalculixCcxTools"
-        self.Object = obj  # keep a ref to the DocObj for nonGui usage
-        obj.Proxy = self  # link between App::DocumentObject to  this object
+        super(_FemSolverCalculix, self).__init__(obj)
 
         # not needed ATM
         # fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
@@ -273,13 +276,3 @@ class _FemSolverCalculix():
         )
         dimout = ccx_prefs.GetBool("BeamShellOutput", False)
         obj.BeamShellResultOutput3D = dimout
-
-    def execute(self, obj):
-        return
-
-    def __getstate__(self):
-        return self.Type
-
-    def __setstate__(self, state):
-        if state:
-            self.Type = state