diff --git a/src/applications/harbormaster/controller/HarbormasterBuildActionController.php b/src/applications/harbormaster/controller/HarbormasterBuildActionController.php
--- a/src/applications/harbormaster/controller/HarbormasterBuildActionController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildActionController.php
@@ -74,21 +74,21 @@
       case HarbormasterBuildCommand::COMMAND_RESTART:
         if ($can_issue) {
           $title = pht('Really restart build?');
-          $body = pht(
-            'Progress on this build will be discarded and the build will '.
-            'restart. Side effects of the build will occur again. Really '.
-            'restart build?');
-          $submit = pht('Restart Build');
-        } else {
-          $title = pht('Unable to Restart Build');
           if ($build->isRestarting()) {
             $body = pht(
-              'This build is already restarting. You can not reissue a '.
-              'restart command to a restarting build.');
+              'This build is already restarting.  Really '.
+              'restart build?');
           } else {
             $body = pht(
-              'You can not restart this build.');
+              'Progress on this build will be discarded and the build will '.
+              'restart. Side effects of the build will occur again. Really '.
+              'restart build?');
           }
+          $submit = pht('Restart Build');
+        } else {
+          $title = pht('Unable to Restart Build');
+          $body = pht(
+            'You can not restart this build.');
         }
         break;
       case HarbormasterBuildCommand::COMMAND_STOP:
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
@@ -305,7 +305,7 @@
   }
 
   public function canRestartBuild() {
-    return !$this->isRestarting();
+    return true;
   }
 
   public function canStopBuild() {