diff --git a/static/js/editPanel.js b/static/js/editPanel.js
index 0001e4e6..b6793545 100644
--- a/static/js/editPanel.js
+++ b/static/js/editPanel.js
@@ -403,6 +403,7 @@ pandora.ui.editPanel = function(isEmbed) {
         pandora.$ui.mainPanel.replaceElement(1, that);
         updateSmallTimelineURL();
         ui.edits[ui.edit].view == 'grid' && enableDragAndDrop();
+        that.gainFocus();
     }
 
     function renderEdits() {