diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py
index fce8f835a..25cb31ec5 100644
--- a/src/Mod/Fem/InitGui.py
+++ b/src/Mod/Fem/InitGui.py
@@ -62,7 +62,7 @@ class FemWorkbench (Workbench):
 
         import subprocess
         from platform import system
-        ccx_path = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem").GetString("ccxBinaryPath")
+        ccx_path = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/Ccx").GetString("ccxBinaryPath")
         if not ccx_path:
             try:
                 if system() == 'Linux':
@@ -72,7 +72,7 @@ class FemWorkbench (Workbench):
                 elif system() == 'Windows':
                     ccx_path = FreeCAD.getHomePath() + 'bin/ccx.exe'
                 if ccx_path:
-                    FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem").SetString("ccxBinaryPath", ccx_path)
+                    FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/Ccx").SetString("ccxBinaryPath", ccx_path)
                 else:
                     FreeCAD.Console.PrintError("CalculiX ccx binary not found! Please set it manually in FEM preferences.\n")
             except Exception as e:
diff --git a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
index be2f21ba0..b4b4d3f71 100644
--- a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
+++ b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
@@ -40,8 +40,8 @@ if FreeCAD.GuiUp:
 class _TaskPanelFemSolverCalculix:
     def __init__(self, solver_object):
         self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelFemSolverCalculix.ui")
-        self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
-        ccx_binary = self.fem_prefs.GetString("ccxBinaryPath", "")
+        self.ccx_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/Ccx")
+        ccx_binary = self.ccx_prefs.GetString("ccxBinaryPath", "")
         if ccx_binary:
             self.CalculixBinary = ccx_binary
             print ("Using CalculiX binary path from FEM preferences: {}".format(ccx_binary))
@@ -53,7 +53,6 @@ class _TaskPanelFemSolverCalculix:
                 self.CalculixBinary = FreeCAD.getHomePath() + 'bin/ccx.exe'
             else:
                 self.CalculixBinary = 'ccx'
-        self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
 
         self.solver_object = solver_object
 
@@ -222,10 +221,10 @@ class _TaskPanelFemSolverCalculix:
 
     def editCalculixInputFile(self):
         print ('editCalculixInputFile {}'.format(self.inp_file_name))
-        if self.fem_prefs.GetBool("UseInternalEditor", True):
+        if self.ccx_prefs.GetBool("UseInternalEditor", True):
             FemGui.open(self.inp_file_name)
         else:
-            ext_editor_path = self.fem_prefs.GetString("ExternalEditorPath", "")
+            ext_editor_path = self.ccx_prefs.GetString("ExternalEditorPath", "")
             if ext_editor_path:
                 self.start_ext_editor(ext_editor_path, self.inp_file_name)
             else: