diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js
index 62fb1c5c3..02b3e5a8d 100644
--- a/app/assets/javascripts/comments.js
+++ b/app/assets/javascripts/comments.js
@@ -1,6 +1,20 @@
 function initCommentOptions(scrollableContainer, useParentOffset = true) {
   scrollCommentOptions($(".dropdown-comment"), useParentOffset);
 
+  // Reposition dropdown to the left
+  // (only do this when using parent offset)
+  if (useParentOffset) {
+    $(document).on("shown.bs.dropdown", ".dropdown-comment", function() {
+      var $el = $(this);
+      var menu = $el.find(".dropdown-menu");
+      var leftPos = $el.offset().left;
+      if (leftPos + menu.width() > $(window).width()) {
+        menu.offset({ left: leftPos - menu.width() });
+      }
+    });
+  }
+
+  // Reposition dropdowns vertically on scroll events
   document.addEventListener('scroll', function (event) {
     var $target = $(event.target);
     var parent = $(scrollableContainer);
diff --git a/app/assets/javascripts/protocols/steps.js b/app/assets/javascripts/protocols/steps.js
index c7292a6e1..5b6ee01bc 100644
--- a/app/assets/javascripts/protocols/steps.js
+++ b/app/assets/javascripts/protocols/steps.js
@@ -359,7 +359,6 @@ function initStepCommentForm(ev, $el) {
   var $form = $el.find("ul form");
 
   var $commentInput = $form.find("#comment_message");
-  $form.onSubmitValidator(textValidator, $commentInput);
 
   $(".help-block", $form).addClass("hide");