diff --git a/src/components/homescreensettings/homescreensettings.js b/src/components/homescreensettings/homescreensettings.js
index e881edbdbd..633437d26e 100644
--- a/src/components/homescreensettings/homescreensettings.js
+++ b/src/components/homescreensettings/homescreensettings.js
@@ -330,6 +330,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
                     if (next) {
                         viewItem.parentNode.removeChild(viewItem);
                         next.parentNode.insertBefore(viewItem, next.nextSibling);
+                        focusManager.focus(e.target);
                     }
 
                 } else {
@@ -339,6 +340,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
                     if (prev) {
                         viewItem.parentNode.removeChild(viewItem);
                         prev.parentNode.insertBefore(viewItem, prev);
+                        focusManager.focus(e.target);
                     }
                 }
             }