diff --git a/src/app/ui/editor/drawing_state.cpp b/src/app/ui/editor/drawing_state.cpp
index f2bb12b99..fe7a34d03 100644
--- a/src/app/ui/editor/drawing_state.cpp
+++ b/src/app/ui/editor/drawing_state.cpp
@@ -215,6 +215,16 @@ bool DrawingState::onKeyDown(Editor* editor, KeyMessage* msg)
 bool DrawingState::onKeyUp(Editor* editor, KeyMessage* msg)
 {
   m_toolLoopManager->releaseKey(msg->scancode());
+
+  // Cancel drawing loop
+  if (m_toolLoopManager->isCanceled()) {
+    destroyLoop(editor);
+
+    // Change to standby state
+    editor->backToPreviousState();
+    editor->releaseMouse();
+  }
+
   return true;
 }