diff --git a/src/ui/TextField.cpp b/src/ui/TextField.cpp
index 52ac2f52..e7087bdd 100644
--- a/src/ui/TextField.cpp
+++ b/src/ui/TextField.cpp
@@ -228,6 +228,11 @@ void TextField::onSelectKey(const SelectKeyEvent& e) {
 			}
 			e.consume(this);
 		}
+		// Escape
+		if (e.key == GLFW_KEY_ESCAPE && (e.mods & RACK_MOD_MASK) == 0) {
+			APP->event->setSelectedWidget(NULL);
+			e.consume(this);
+		}
 		// Tab
 		if (e.key == GLFW_KEY_TAB && (e.mods & RACK_MOD_MASK) == 0) {
 			if (nextField)