diff --git a/sites/all/modules/workflow_extensions/workflow_extensions.module b/sites/all/modules/workflow_extensions/workflow_extensions.module
index 003f34e..c958a55 100755
--- a/sites/all/modules/workflow_extensions/workflow_extensions.module
+++ b/sites/all/modules/workflow_extensions/workflow_extensions.module
@@ -321,21 +321,36 @@ function _workflow_extensions_replace_with_buttons(&$form, $workflow_name) {
   $states = $form['workflow'][$workflow_name]['#options'];
   $submit_handlers = _workflow_extensions_assign_handlers($form);
   foreach ($states as $sid => $to_state_name) {
+    // Create button for transition from current_sid to destination state.
     if ($sid != $current_sid) {
-      // Create button for transition from current_sid to destination state.
       $button = array();
       $button['#value'] = workflow_extensions_get_transition_label($form['#wf']->wid, $current_state_name, workflow_get_state_name($sid), $node);
-      $button['#type'] = 'submit';
-      $button['#to_state'] = $sid;
-      if (isset($form['buttons']['submit']['#weight'])) { // node form
-        $button['#weight'] = $form['buttons']['submit']['#weight'] + 1;
-      }
-      elseif (isset($form['submit']['#weight'])) { // comment form
-        $button['#weight'] = $form['submit']['#weight'];
-      }
-      $button['#submit'] = $submit_handlers;
+    }
+    else {
+      // Reuse the submit button, to stay in this state.
+      if (empty($form['buttons']['submit'])) {
+        // If there was no submit button, we were probably on the workflow
+        // transition page and not the node edit page.
+        continue;
+      }
+      $button = $form['buttons']['submit'];
+    }
+    $button['#type'] = 'submit';
+    $button['#to_state'] = $sid;
+    if (isset($form['buttons']['submit']['#weight'])) { // node form
+      $button['#weight'] = $form['buttons']['submit']['#weight'] + 1;
+    }
+    elseif (isset($form['submit']['#weight'])) { // comment form
+      $button['#weight'] = $form['submit']['#weight'];
+    }
+    $button['#submit'] = $submit_handlers;
+
+    if ($sid != $current_sid) {
       $form['buttons']["submit_to_$to_state_name"] = $button;
     }
+    else {
+      $form['buttons']["submit"] = $button;
+    }
   }
   // Get rid of workflow radio buttons that live inside the fieldset
   unset($form['workflow'][$workflow_name]);