diff --git a/js/wpaint.js b/js/wpaint.js
index 0bd2c0cc..5bbf487e 100644
--- a/js/wpaint.js
+++ b/js/wpaint.js
@@ -87,7 +87,7 @@ oekaki.init = function() {
       });
 
 
-      $("#wpaintdiv input").on("keydown", function(e) { if (e.keycode == 13) { e.preventDefault(); e.stopPropagation(); } });
+      $("#wpaintdiv").on("keydown", "input", function(e) { if (e.keycode == 13) { e.preventDefault(); e.stopPropagation(); } });
       $('#wpaintctr .ui-resizable-se').css({'height':'12px', 'width':'12px'});
     }
   });