diff --git a/src/Mod/Fem/_CommandFemBeamSection.py b/src/Mod/Fem/_CommandFemBeamSection.py
index bd5111662b6d..cc08eaa34ef1 100644
--- a/src/Mod/Fem/_CommandFemBeamSection.py
+++ b/src/Mod/Fem/_CommandFemBeamSection.py
@@ -26,6 +26,7 @@
 
 
 import FreeCAD
+from FemCommands import FemCommands
 
 if FreeCAD.GuiUp:
     import FreeCADGui
@@ -33,25 +34,21 @@
     from PySide import QtCore
 
 
-class _CommandFemBeamSection:
+class _CommandFemBeamSection(FemCommands):
     "The Fem_BeamSection command definition"
-    def GetResources(self):
-        return {'Pixmap': 'fem-beam-section',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_BeamSection", "FEM Beam Cross Section Definition ..."),
-                'Accel': "C, B",
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_BeamSection", "Creates a FEM Beam Cross Section")}
+    def __init__(self):
+        super(_CommandFemBeamSection, self).__init__()
+        self.resources = {'Pixmap': 'fem-beam-section',
+                          'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_BeamSection", "FEM Beam Cross Section Definition ..."),
+                          'Accel': "C, B",
+                          'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_BeamSection", "Creates a FEM Beam Cross Section")}
+        self.is_active = 'with_analysis'
 
     def Activated(self):
         FreeCAD.ActiveDocument.openTransaction("Create FemBeamSection")
         FreeCADGui.addModule("FemBeamSection")
         FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemBeamSection.makeFemBeamSection()]")
 
-    def IsActive(self):
-        if FemGui.getActiveAnalysis():
-            return True
-        else:
-            return False
-
 
 if FreeCAD.GuiUp:
     FreeCADGui.addCommand('Fem_BeamSection', _CommandFemBeamSection())
diff --git a/src/Mod/Fem/_CommandFemShellThickness.py b/src/Mod/Fem/_CommandFemShellThickness.py
index 1731b29287a4..ae9d992c4b74 100644
--- a/src/Mod/Fem/_CommandFemShellThickness.py
+++ b/src/Mod/Fem/_CommandFemShellThickness.py
@@ -26,6 +26,7 @@
 
 
 import FreeCAD
+from FemCommands import FemCommands
 
 if FreeCAD.GuiUp:
     import FreeCADGui
@@ -33,25 +34,21 @@
     from PySide import QtCore
 
 
-class _CommandFemShellThickness:
+class _CommandFemShellThickness(FemCommands):
     "The Fem_ShellThickness command definition"
-    def GetResources(self):
-        return {'Pixmap': 'fem-shell-thickness',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_ShellThickness", "FEM Shell Plate Thickness Definition ..."),
-                'Accel': "C, S",
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_ShellThickness", "Creates a FEM Shell Thickness")}
+    def __init__(self):
+        super(_CommandFemShellThickness, self).__init__()
+        self.resources = {'Pixmap': 'fem-shell-thickness',
+                          'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_ShellThickness", "FEM Shell Plate Thickness Definition ..."),
+                          'Accel': "C, S",
+                          'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_ShellThickness", "Creates a FEM Shell Thickness")}
+        self.is_active = 'with_analysis'
 
     def Activated(self):
         FreeCAD.ActiveDocument.openTransaction("Create FemShellThickness")
         FreeCADGui.addModule("FemShellThickness")
         FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemShellThickness.makeFemShellThickness()]")
 
-    def IsActive(self):
-        if FemGui.getActiveAnalysis():
-            return True
-        else:
-            return False
-
 
 if FreeCAD.GuiUp:
     FreeCADGui.addCommand('Fem_ShellThickness', _CommandFemShellThickness())