diff --git a/architype.js b/architype.js
index 12c0161..663ec18 100644
--- a/architype.js
+++ b/architype.js
@@ -437,6 +437,8 @@ class EditorEntryBase extends ListenUtils {
         this.elem_.nextElementSibling.focus();
       } else if (this.elem_.previousElementSibling) {
         this.elem_.previousElementSibling.focus();
+      } else if (this.elem_.parentElement) {
+        this.elem_.parentElement.focus();
       }
     }