diff --git a/src/Controllers/CommentController.php b/src/Controllers/CommentController.php
index 43a1b54d..a6436118 100644
--- a/src/Controllers/CommentController.php
+++ b/src/Controllers/CommentController.php
@@ -50,10 +50,11 @@ class CommentController
 
 		$post = Model_Post::locate($postId);
 
-		$text = InputHelper::get('text');
-		if (!empty($text))
+		if (InputHelper::get('submit'))
 		{
+			$text = InputHelper::get('text');
 			$text = Model_Comment::validateText($text);
+
 			$comment = R::dispense('comment');
 			$comment->post = $post;
 			if ($this->context->loggedIn)
diff --git a/src/Views/post-view.phtml b/src/Views/post-view.phtml
index b5f33d6f..29c03c49 100644
--- a/src/Views/post-view.phtml
+++ b/src/Views/post-view.phtml
@@ -307,6 +307,8 @@
 				<div class="input-wrapper"><textarea name="text" cols="50" rows="3"></textarea></div>
 			</div>
 
+			<input type="hidden" name="submit" value="1"/>
+
 			<div>
 				<button name="sender" type="submit" value="preview">Preview</button>&nbsp;
 				<button name="sender" type="submit" value="submit">Submit</button>