diff --git a/src/workflow/ArcanistBaseWorkflow.php b/src/workflow/ArcanistBaseWorkflow.php
index 1b3a96bc..421e2506 100644
--- a/src/workflow/ArcanistBaseWorkflow.php
+++ b/src/workflow/ArcanistBaseWorkflow.php
@@ -916,12 +916,13 @@ abstract class ArcanistBaseWorkflow extends Phobject {
   private function askForAdd() {
     if ($this->commitMode == self::COMMIT_DISABLE) {
       return false;
-    } else if ($this->commitMode == self::COMMIT_ENABLE) {
-      return true;
     }
     if ($this->shouldAmend === null) {
       $this->shouldAmend = $this->shouldAmend();
     }
+    if ($this->commitMode == self::COMMIT_ENABLE) {
+      return true;
+    }
     if ($this->shouldAmend) {
       $prompt = "Do you want to amend these files to the commit?";
     } else {