diff --git a/app/assets/javascripts/discourse/views/share_view.js b/app/assets/javascripts/discourse/views/share_view.js
index 4f296c2e08e..dad1c9c28b2 100644
--- a/app/assets/javascripts/discourse/views/share_view.js
+++ b/app/assets/javascripts/discourse/views/share_view.js
@@ -36,7 +36,7 @@ Discourse.ShareView = Discourse.View.extend({
       _this.get('controller').close();
       return true;
     });
-    return $('html').on('click.discoure-share-link', '[data-share-url]', function(e) {
+    $('html').on('click.discoure-share-link', '[data-share-url]', function(e) {
       var $currentTarget, url;
       e.preventDefault();
       $currentTarget = $(e.currentTarget);
@@ -50,11 +50,17 @@ Discourse.ShareView = Discourse.View.extend({
       _this.get('controller').shareLink(e, url);
       return false;
     });
+    $('html').on('keydown.shareView', function(e){
+      if (e.keyCode === 27) {
+        _this.get('controller').close();
+      }
+    });
   },
 
   willDestroyElement: function() {
     $('html').off('click.discoure-share-link');
     $('html').off('click.outside-share-link');
+    $('html').off('keydown.shareView');
   }
 
 });