diff --git a/examples/menu-button/js/MenuItemLinks.js b/examples/menu-button/js/MenuItemLinks.js
index 9ad67b7966..13df5e444d 100644
--- a/examples/menu-button/js/MenuItemLinks.js
+++ b/examples/menu-button/js/MenuItemLinks.js
@@ -76,15 +76,17 @@ MenuItemLinks.prototype.handleKeydown = function (event) {
   if (event.shiftKey) {
     if (isPrintableCharacter(char)) {
       this.menu.setFocusByFirstCharacter(this, char);
+      flag = true;
+    }
+
+    if (event.keyCode === this.keyCode.TAB) {
+      this.menu.setFocusToController();
+      this.menu.close(true);
     }
   }
   else {
     switch (event.keyCode) {
 
-      case this.keyCode.SPACE:
-        flag = true;
-        break;
-
       case this.keyCode.ESC:
         this.menu.setFocusToController();
         this.menu.close(true);
diff --git a/examples/menu-button/js/PopupMenuLinks.js b/examples/menu-button/js/PopupMenuLinks.js
index 2a2d9b937f..1beca07cd1 100644
--- a/examples/menu-button/js/PopupMenuLinks.js
+++ b/examples/menu-button/js/PopupMenuLinks.js
@@ -48,7 +48,7 @@ var PopupMenuLinks = function (domNode, controllerObj) {
   var childElement = domNode.firstElementChild;
   while (childElement) {
     var menuitem = childElement.firstElementChild;
-    if (menuitem && menuitem === 'A') {
+    if (menuitem && menuitem.tagName !== 'A') {
       throw new Error(msgPrefix + 'has descendant elements that are not A elements.');
     }
     childElement = childElement.nextElementSibling;