diff --git a/src/applications/ponder/controller/PonderCommentSaveController.php b/src/applications/ponder/controller/PonderCommentSaveController.php
index 2a81e2b48e..8574e85d85 100644
--- a/src/applications/ponder/controller/PonderCommentSaveController.php
+++ b/src/applications/ponder/controller/PonderCommentSaveController.php
@@ -40,6 +40,16 @@ final class PonderCommentSaveController extends PonderController {
     }
     $content = $request->getStr('content');
 
+    if (!strlen(trim($content))) {
+      $dialog = new AphrontDialogView();
+      $dialog->setUser($request->getUser());
+      $dialog->setTitle('Empty comment');
+      $dialog->appendChild('<p>Your comment must not be empty.</p>');
+      $dialog->addCancelButton('/Q'.$question_id);
+
+      return id(new AphrontDialogResponse())->setDialog($dialog);
+    }
+
     $res = new PonderComment();
     $res
       ->setContent($content)
@@ -51,8 +61,7 @@ final class PonderCommentSaveController extends PonderController {
 
     return id(new AphrontRedirectResponse())
       ->setURI(
-        id(new PhutilURI('/Q'. $question->getID()))
-        ->setFragment('comment-' . $res->getID()));
+        id(new PhutilURI('/Q'. $question->getID())));
   }
 
 }
diff --git a/src/applications/ponder/view/PonderAddCommentView.php b/src/applications/ponder/view/PonderAddCommentView.php
index 2fdbf354df..83e491726b 100644
--- a/src/applications/ponder/view/PonderAddCommentView.php
+++ b/src/applications/ponder/view/PonderAddCommentView.php
@@ -55,6 +55,7 @@ final class PonderAddCommentView extends AphrontView {
     $form
       ->setUser($this->user)
       ->setAction($this->actionURI)
+      ->setWorkflow(true)
       ->addHiddenInput('target', $target)
       ->addHiddenInput('question_id', $questionID)
       ->appendChild(