diff --git a/ChangeLog b/ChangeLog
index aab2a0be53..4ab8b8b658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog
 - issue #13241 Redirect user to last page that has any tables to display
 - issue #13266 Fix link to User accounts overview page
 - issue #13274 Fix error in query builder
+- issue #13177 Grid editing repeats action after error
 
 4.7.0 (2017-03-28)
 - patch #12233 [Display] Improve message when renaming database to same name
diff --git a/js/makegrid.js b/js/makegrid.js
index a63ecf3be5..61856f2670 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -2079,7 +2079,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 // hide edit cell if the click is not fromDat edit area
                 if ($(e.target).parents().index($(g.cEdit)) == -1 &&
                     !$(e.target).parents('.ui-datepicker-header').length &&
-                    !$('.browse_foreign_modal.ui-dialog:visible').length
+                    !$('.browse_foreign_modal.ui-dialog:visible').length &&
+                    !$(e.target).hasClass('error')
                 ) {
                     g.hideEditCell();
                 }