diff --git a/src/applications/ponder/controller/PonderQuestionStatusController.php b/src/applications/ponder/controller/PonderQuestionStatusController.php
index ab791b740f..da1cdfd76e 100644
--- a/src/applications/ponder/controller/PonderQuestionStatusController.php
+++ b/src/applications/ponder/controller/PonderQuestionStatusController.php
@@ -42,11 +42,13 @@ final class PonderQuestionStatusController
 
     $radio = id(new AphrontFormRadioButtonControl())
       ->setLabel(pht('Status'))
-      ->setName('status')
-      ->setValue($v_status);
+      ->setName('status');
 
     foreach (PonderQuestionStatus::getQuestionStatusMap() as $value => $name) {
       $description = PonderQuestionStatus::getQuestionStatusDescription($value);
+      if ($value === $v_status) {
+        continue;
+      }
       $radio->addButton($value, $name, $description);
     }
 
diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
index 63fe4e3539..446587facf 100644
--- a/src/applications/ponder/controller/PonderQuestionViewController.php
+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
@@ -144,13 +144,8 @@ final class PonderQuestionViewController extends PonderController {
 
     $curtain = $this->newCurtainView($question);
 
-    if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
-      $name = pht('Close Question');
-      $icon = 'fa-check-square-o';
-    } else {
-      $name = pht('Reopen Question');
-      $icon = 'fa-square-o';
-    }
+    $name = pht('Change Question Status');
+    $icon = 'fa-square-o';
 
     $curtain->addAction(
       id(new PhabricatorActionView())