diff --git a/apps/comments/js/commentsmodifymenu.js b/apps/comments/js/commentsmodifymenu.js
index bd777ba5fa6..1c5f572d8cc 100644
--- a/apps/comments/js/commentsmodifymenu.js
+++ b/apps/comments/js/commentsmodifymenu.js
@@ -63,9 +63,9 @@
 				$target = $target.closest('.menuitem');
 			}
 
-			this.trigger('select:menu-item-clicked', event, $target.data('action'));
-
 			OC.hideMenus();
+			
+			this.trigger('select:menu-item-clicked', event, $target.data('action'));
 		},
 
 		/**
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index ad5f67842db..9477cb0c301 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -33,7 +33,7 @@
 		'    </div>' +
 		'    <form class="newCommentForm">' +
 		'        <div contentEditable="true" class="message" data-placeholder="{{newMessagePlaceholder}}">{{message}}</div>' +
-		'        <input class="submit icon-confirm" type="submit" value="" />' +
+		'        <input class="submit icon-confirm has-tooltip" type="submit" value="" title="{{submitText}}"/>' +
 		'        <div class="submitLoading icon-loading-small hidden"></div>'+
 		'    </form>' +
 		'</{{tag}}>';