diff --git a/src/Mod/Fem/FemGmshTools.py b/src/Mod/Fem/FemGmshTools.py
index d3ec237c83..1fc4453d1e 100644
--- a/src/Mod/Fem/FemGmshTools.py
+++ b/src/Mod/Fem/FemGmshTools.py
@@ -68,7 +68,6 @@ class FemGmshTools():
             print('Error in order')
 
         # dimension
-        # known_element_dimensions = ['Automatic', '1D', '2D', '3D']
         self.dimension = self.mesh_obj.ElementDimension
 
         # Algorithm2D
@@ -129,9 +128,10 @@ class FemGmshTools():
 
     def get_dimension(self):
         # Dimension
-        # GMSH uses the hightest availabe.
-        # A use case for not auto would be a surface (2D) mesh of a solid or other 3d shape
-        if self.dimension == 'Automatic':
+        # known_element_dimensions = ['From Shape', '1D', '2D', '3D']
+        # if not given, GMSH uses the hightest availabe.
+        # A use case for not "From Shape" would be a surface (2D) mesh of a solid
+        if self.dimension == 'From Shape':
             shty = self.part_obj.Shape.ShapeType
             if shty == 'Solid' or shty == 'CompSolid':
                 # print('Found: ' + shty)
diff --git a/src/Mod/Fem/_FemMeshGmsh.py b/src/Mod/Fem/_FemMeshGmsh.py
index 82dadff8ec..ebbffe79ca 100644
--- a/src/Mod/Fem/_FemMeshGmsh.py
+++ b/src/Mod/Fem/_FemMeshGmsh.py
@@ -33,7 +33,7 @@ class _FemMeshGmsh():
     """
 
     # they will be used from the task panel too, thus they need to be outside of the __init__
-    known_element_dimensions = ['Automatic', '1D', '2D', '3D']
+    known_element_dimensions = ['From Shape', '1D', '2D', '3D']
     known_element_orders = ['1st', '2nd']
     known_mesh_algorithm_2D = ['Automatic', 'MeshAdapt', 'Delaunay', 'Frontal', 'BAMG', 'DelQuad']
     known_mesh_algorithm_3D = ['Automatic', 'Delaunay', 'New Delaunay', 'Frontal', 'Frontal Delaunay', 'Frontal Hex', 'MMG3D', 'R-tree']
@@ -57,7 +57,7 @@ class _FemMeshGmsh():
 
         obj.addProperty("App::PropertyEnumeration", "ElementDimension", "FEM GMSH Mesh Params", "Dimension of mesh elements (Auto = according ShapeType of part to mesh)")
         obj.ElementDimension = _FemMeshGmsh.known_element_dimensions
-        obj.ElementDimension = 'Automatic'  # according ShapeType of Part to mesh
+        obj.ElementDimension = 'From Shape'  # according ShapeType of Part to mesh
 
         obj.addProperty("App::PropertyEnumeration", "ElementOrder", "FEM GMSH Mesh Params", "Order of mesh elements")
         obj.ElementOrder = _FemMeshGmsh.known_element_orders