diff --git a/src/Mod/Fem/TaskPanelFemSolverCalculix.ui b/src/Mod/Fem/TaskPanelFemSolverCalculix.ui
index edb11aa0a..6c2c63452 100644
--- a/src/Mod/Fem/TaskPanelFemSolverCalculix.ui
+++ b/src/Mod/Fem/TaskPanelFemSolverCalculix.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>258</width>
+    <width>347</width>
     <height>458</height>
    </rect>
   </property>
@@ -54,14 +54,14 @@
      <property name="title">
       <string>Analysis type</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QGridLayout" name="gridLayout">
       <property name="leftMargin">
        <number>9</number>
       </property>
       <property name="bottomMargin">
        <number>9</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="Gui::PrefRadioButton" name="rb_static_analysis">
         <property name="text">
          <string>Static</string>
@@ -71,13 +71,20 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
        <widget class="Gui::PrefRadioButton" name="rb_frequency_analysis">
         <property name="text">
          <string>Frequency</string>
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="Gui::PrefRadioButton" name="rb_thermomech_analysis">
+        <property name="text">
+         <string>Thermo mechanical</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
index 2821c46b2..3e51d5a30 100644
--- a/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
+++ b/src/Mod/Fem/_TaskPanelFemSolverCalculix.py
@@ -70,6 +70,7 @@ class _TaskPanelFemSolverCalculix:
         QtCore.QObject.connect(self.form.pb_run_ccx, QtCore.SIGNAL("clicked()"), self.runCalculix)
         QtCore.QObject.connect(self.form.rb_static_analysis, QtCore.SIGNAL("clicked()"), self.select_static_analysis)
         QtCore.QObject.connect(self.form.rb_frequency_analysis, QtCore.SIGNAL("clicked()"), self.select_frequency_analysis)
+        QtCore.QObject.connect(self.form.rb_thermomech_analysis, QtCore.SIGNAL("clicked()"), self.select_thermomech_analysis)
 
         QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("started()"), self.calculixStarted)
         QtCore.QObject.connect(self.Calculix, QtCore.SIGNAL("stateChanged(QProcess::ProcessState)"), self.calculixStateChanged)
@@ -159,6 +160,8 @@ class _TaskPanelFemSolverCalculix:
             self.form.rb_static_analysis.setChecked(True)
         elif self.solver_object.AnalysisType == 'frequency':
             self.form.rb_frequency_analysis.setChecked(True)
+        elif self.solver_object.AnalysisType == 'thermomech':
+            self.form.rb_thermomech_analysis.setChecked(True)
         return
 
     def accept(self):
@@ -256,6 +259,9 @@ class _TaskPanelFemSolverCalculix:
     def select_frequency_analysis(self):
         self.select_analysis_type('frequency')
 
+    def select_thermomech_analysis(self):
+        self.select_analysis_type('thermomech')
+
     # That function overlaps with FemTools setup_working_dir and needs to be removed when we migrate fully to FemTools
     def setup_working_dir(self):
         wd = self.solver_object.WorkingDir