diff --git a/index.js b/index.js
index 8adc5ad..a903d8a 100644
--- a/index.js
+++ b/index.js
@@ -126,7 +126,7 @@ function isFormMethodDialog(el) {
 function findFocusableElementWithin(hostElement) {
   // Note that this is 'any focusable area'. This list is probably not exhaustive, but the
   // alternative involves stepping through and trying to focus everything.
-  var opts = ['button', 'input', 'keygen', 'select', 'textarea'];
+  var opts = ['button', 'input', 'keygen', 'select', 'textarea', 'a[href]', 'area[href]', 'iframe', 'object', 'embed', '[contenteditable]'];
   var query = opts.map(function(el) {
     return el + ':not([disabled])';
   });
diff --git a/package-lock.json b/package-lock.json
index e9c7d2b..3519463 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dialog-polyfill",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {