diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
index 24fadbacb5..196854c270 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
@@ -515,7 +515,7 @@ class ObjectController extends AbstractController
                 }
 
                 // Hiding submit button or changing its label if necessary
-                if($aFormProperties['properties']['always_show_submit'] === false)
+                if($aFormProperties['properties']['always_show_submit'] === false && !empty($aFormData['buttons']['transitions']))
                 {
                     unset($aFormData['buttons']['submit']);
                 }
diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
index 8cdf09dece..5c9c9a9aeb 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
@@ -863,6 +863,7 @@ class ApplicationHelper
                             {
                                 case 'always_show_submit':
                                     $aFormProperties['always_show_submit'] = ($oPropertyNode->GetText('false') === 'true') ? true : false;
+                                    break;
                             }
                         }
                     }