diff --git a/app/assets/javascripts/comments.js.erb b/app/assets/javascripts/comments.js.erb
index 9ff3903f9..3c8df8440 100644
--- a/app/assets/javascripts/comments.js.erb
+++ b/app/assets/javascripts/comments.js.erb
@@ -289,6 +289,11 @@ var Comments = (function() {
     $(parent).unbind('click').on('click', '[data-action=edit-comment]', function() {
 
       var $this = $(this);
+      // close dropdown on click
+      var dropdown = $($this.parents(".dropdown-comment.open").get(0));
+      if(dropdown.length) { // safety first
+        dropdown.removeClass('open');
+      }
       $.ajax({
           url: $this.attr('data-url'),
           type: 'GET',