diff --git a/src/app/commands/cmd_cel_properties.cpp b/src/app/commands/cmd_cel_properties.cpp
index 8aa440c38..f65e56075 100644
--- a/src/app/commands/cmd_cel_properties.cpp
+++ b/src/app/commands/cmd_cel_properties.cpp
@@ -126,7 +126,9 @@ private:
 
       case kKeyDownMessage:
         if (opacity()->hasFocus()) {
-          if (static_cast<KeyMessage*>(msg)->scancode() == kKeyEnter) {
+          KeyScancode scancode = static_cast<KeyMessage*>(msg)->scancode();
+          if (scancode == kKeyEnter ||
+              scancode == kKeyEsc) {
             onCommitChange();
             closeWindow(this);
             return true;