diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index 7187c83ee3..1fe521f19e 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -1684,10 +1684,11 @@ color: white;
 background-color: #252525;
 }
 
-/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 */
+/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 
+Reverted due to regression https://github.com/FreeCAD/FreeCAD/issues/24604
 QSint--ActionGroup QFrame[class="content"] QTableView {
   min-height: 300px;
-}
+} */
 
 /* found inside Part Design Workbench and "make a draft on a face" Task panel options */
 QSint--ActionGroup QFrame[class="content"] QToolButton {
diff --git a/src/Gui/Stylesheets/FreeCAD Light.qss b/src/Gui/Stylesheets/FreeCAD Light.qss
index e57b4a41d3..7baf85ac9e 100644
--- a/src/Gui/Stylesheets/FreeCAD Light.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Light.qss	
@@ -1682,10 +1682,11 @@ color: black;
 background-color: #f0f0f0;
 }
 
-/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 */
+/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 
+Reverted due to regression https://github.com/FreeCAD/FreeCAD/issues/24604
 QSint--ActionGroup QFrame[class="content"] QTableView {
   min-height: 300px;
-}
+} */
 
 /* found inside Part Design Workbench and "make a draft on a face" Task panel options */
 QSint--ActionGroup QFrame[class="content"] QToolButton {
diff --git a/src/Gui/Stylesheets/FreeCAD.qss b/src/Gui/Stylesheets/FreeCAD.qss
index d330e6edfc..a20fdf2cee 100644
--- a/src/Gui/Stylesheets/FreeCAD.qss
+++ b/src/Gui/Stylesheets/FreeCAD.qss
@@ -1174,7 +1174,7 @@ QPushButton {
   border: 1px solid @ButtonBorderColor;
   border-radius: @InputFieldBorderRadius;
   padding: 3px 12px;
-  min-width: 64px;
+  min-width: 80px; /* changed from 64px to fix issue  #24604 and align with setting from 1.0.x */
 }
 
 QPushButton:default {
@@ -1571,10 +1571,11 @@ QSint--ActionGroup QFrame[class="content"] QTableView {
   background-color: @PrimaryColor;
 }
 
-/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 */
+/* Fix for tables inside task panels, see https://github.com/FreeCAD/FreeCAD/issues/22957 
+Reverted due to regression https://github.com/FreeCAD/FreeCAD/issues/24604
 QSint--ActionGroup QFrame[class="content"] QTableView {
   min-height: 300px;
-}
+} */
 
 /* found inside Part Design Workbench and "make a draft on a face" Task panel options */
 QSint--ActionGroup QFrame[class="content"] QToolButton {
diff --git a/src/Mod/CAM/Path/Base/Gui/SetupSheet.py b/src/Mod/CAM/Path/Base/Gui/SetupSheet.py
index e2162c065a..497d6e59d0 100644
--- a/src/Mod/CAM/Path/Base/Gui/SetupSheet.py
+++ b/src/Mod/CAM/Path/Base/Gui/SetupSheet.py
@@ -183,6 +183,7 @@ class OpTaskPanel:
         self.form.table.setModel(self.model)
         self.form.table.setItemDelegateForColumn(2, self.delegate)
         self.form.table.resizeColumnsToContents()
+        self.form.table.setMinimumHeight(300)
 
         self.model.dataChanged.connect(self.updateData)