diff --git a/src/extensions/default/WebPlatformDocs/InlineDocsViewer.html b/src/extensions/default/WebPlatformDocs/InlineDocsViewer.html
index c3c152e0a45..d2d3b15d219 100644
--- a/src/extensions/default/WebPlatformDocs/InlineDocsViewer.html
+++ b/src/extensions/default/WebPlatformDocs/InlineDocsViewer.html
@@ -17,5 +17,5 @@ <h1>{{propName}}</h1>
         </div>
     </div>
     <div class="content-bottom"></div>
-    <a class="more-info no-focus" href="{{url}}" title="{{url}}">{{Strings.DOCS_MORE_LINK}}</a>
+    <a class="more-info" href="{{url}}" title="{{url}}">{{Strings.DOCS_MORE_LINK}}</a>
 </div>
\ No newline at end of file
diff --git a/src/extensions/default/WebPlatformDocs/InlineDocsViewer.js b/src/extensions/default/WebPlatformDocs/InlineDocsViewer.js
index 607471342d1..e9df4160c93 100644
--- a/src/extensions/default/WebPlatformDocs/InlineDocsViewer.js
+++ b/src/extensions/default/WebPlatformDocs/InlineDocsViewer.js
@@ -194,14 +194,14 @@ define(function (require, exports, module) {
 
         // Set focus
         this.$scroller[0].focus();
-        this.$wrapperDiv.on("keydown", this._onKeydown);
+        this.$wrapperDiv[0].addEventListener("keydown", this._onKeydown, true);
     };
     
     InlineDocsViewer.prototype.onClosed = function () {
         InlineDocsViewer.prototype.parentClass.onClosed.apply(this, arguments);
         
         $(window).off("resize", this._sizeEditorToContent);
-        this.$wrapperDiv.off("keydown", this._onKeydown);
+        this.$wrapperDiv[0].removeEventListener("keydown", this._onKeydown, true);
     };
     
     InlineDocsViewer.prototype._sizeEditorToContent = function () {