diff --git a/static/js/editPanel.js b/static/js/editPanel.js
index a006613cc..21c986231 100644
--- a/static/js/editPanel.js
+++ b/static/js/editPanel.js
@@ -412,7 +412,9 @@ pandora.ui.editPanel = function(isEmbed) {
 
         updateSmallTimelineURL();
         ui.edits[ui.edit].view == 'grid' && enableDragAndDrop();
-        that.gainFocus();
+        if (!Ox.Focus.focusedElementIsInput()) {
+            that.gainFocus();
+        }
     }
 
     function renderEdits() {