diff --git a/4chan_x.user.js b/4chan_x.user.js
index 7c2703678..9decc1631 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -742,12 +742,12 @@
       }
     },
     normal: function(e) {
-      var thread;
+      var o, thread;
       thread = nav.getThread();
       switch (keybinds.key) {
         case '<Esc>':
-          if ($('#options')) {
-            return options.rm();
+          if (o = $('#overlay')) {
+            return $.rm(o);
           }
           break;
         case '0':
diff --git a/script.coffee b/script.coffee
index bc4519372..1ac6f577a 100644
--- a/script.coffee
+++ b/script.coffee
@@ -541,7 +541,7 @@ keybinds =
     thread = nav.getThread()
     switch keybinds.key
       when '<Esc>'
-        options.rm() if $ '#options'
+        $.rm o if o = $ '#overlay'
       when '0'
         window.location = "/#{g.BOARD}/0#0"
       when 'I'