diff --git a/js/id/ui/radial_menu.js b/js/id/ui/radial_menu.js
index eb2cf1974..17826d620 100644
--- a/js/id/ui/radial_menu.js
+++ b/js/id/ui/radial_menu.js
@@ -6,7 +6,7 @@ iD.ui.RadialMenu = function(operations) {
         if (!operations.length)
             return;
 
-        selection.node().focus();
+        selection.node().parentNode.focus();
 
         function click(operation) {
             d3.event.stopPropagation();
diff --git a/js/id/ui/restore.js b/js/id/ui/restore.js
index c6996ff23..0c3d0a617 100644
--- a/js/id/ui/restore.js
+++ b/js/id/ui/restore.js
@@ -22,7 +22,7 @@ iD.ui.Restore = function(context) {
             .append('div')
             .attr('class', 'button-wrap joined col6');
 
-        buttons.append('button')
+        var restore = buttons.append('button')
             .attr('class', 'save action button col6')
             .text(t('restore.restore'))
             .on('click', function() {
@@ -37,5 +37,7 @@ iD.ui.Restore = function(context) {
                 context.history().clearSaved();
                 modal.remove();
             });
+
+        restore.node().focus();
     };
 };