diff --git a/js/makegrid.js b/js/makegrid.js
index 97d99361ab..c1ef090600 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -2079,7 +2079,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 if ($(e.target).parents().index($(g.cEdit)) == -1 &&
                     !$(e.target).parents('.ui-datepicker-header').length &&
                     !$('.browse_foreign_modal.ui-dialog:visible').length &&
-                    !$(e.target).hasClass('error')
+                    !$(e.target).closest('.dismissable').length
                 ) {
                     g.hideEditCell();
                 }