diff --git a/js/form.js b/js/form.js
index 91f9ff1..7386477 100644
--- a/js/form.js
+++ b/js/form.js
@@ -104,6 +104,7 @@ const resetVisuals = () => {
   currentScale = DEFAULT_SCALE;
   imgPreview.style.transform = `scale(${DEFAULT_SCALE / 100})`;
   scaleControlValue.value = `${DEFAULT_SCALE}%`;
+  scaleControlValue.setAttribute('value', `${DEFAULT_SCALE}%`);
   updateEffect('none');
   uploadForm.querySelector('#effect-none').checked = true;
 };
@@ -118,9 +119,10 @@ const closeUploadModal = () => {
   document.removeEventListener('keydown', onDocumentKeydown);
 };
 
-// Обработчик Esc (не закрывать, если фокус в полях ввода)
+// Обработчик Esc
 function onDocumentKeydown(evt) {
-  if (isEsc(evt) && document.activeElement !== hashtagInput && document.activeElement !== commentInput) {
+  const isErrorMessageOpen = !!document.querySelector('.error');
+  if (isEsc(evt) && !isErrorMessageOpen && document.activeElement !== hashtagInput && document.activeElement !== commentInput) {
     evt.preventDefault();
     closeUploadModal();
   }
@@ -154,6 +156,7 @@ scaleControlSmaller.addEventListener('click', () => {
     currentScale -= SCALE_STEP;
     imgPreview.style.transform = `scale(${currentScale / 100})`;
     scaleControlValue.value = `${currentScale}%`;
+    scaleControlValue.setAttribute('value', `${currentScale}%`);
   }
 });
 
@@ -162,6 +165,7 @@ scaleControlBigger.addEventListener('click', () => {
     currentScale += SCALE_STEP;
     imgPreview.style.transform = `scale(${currentScale / 100})`;
     scaleControlValue.value = `${currentScale}%`;
+    scaleControlValue.setAttribute('value', `${currentScale}%`);
   }
 });
 
diff --git a/js/main.js b/js/main.js
index 055ad53..96c3af9 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,6 +1,5 @@
 
 import './util.js';
-import './data.js';
 import './form.js';
 
 import { renderThumbnails } from './thumbnails.js';
diff --git a/js/message.js b/js/message.js
index dafc40f..9e243f5 100644
--- a/js/message.js
+++ b/js/message.js
@@ -9,7 +9,7 @@ function hideMessage() {
   if (messageElement) {
     messageElement.remove();
   }
-  document.removeEventListener('keydown', onDocumentKeydown);
+  document.removeEventListener('keydown', onDocumentKeydown, true);
   document.removeEventListener('click', onBodyClick);
 }