diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 6ebc539ba3..55742ce3ea 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -674,7 +674,7 @@ define([
                                 };
                                 btn.setDisabled( true );
                             } else {
-                                btn.setDisabled( btn.keepState.disabled );
+                                btn.setDisabled( btn.keepState && btn.keepState.disabled || lock);
                                 delete btn.keepState;
                             }
                         }