diff --git a/static/js/folders.js b/static/js/folders.js
index 05a5a669d..e98036c6b 100644
--- a/static/js/folders.js
+++ b/static/js/folders.js
@@ -94,7 +94,7 @@ pandora.ui.folders = function(section) {
                         pandora.$ui.personalListsMenu = Ox.MenuButton({
                             items: [
                                 { id: 'newedit', title: Ox._('New Edit'), keyboard: 'control n' },
-                                { id: 'neweditfromselection', title: Ox._('New Edit from Selection'), keyboard: 'shift control n', disabled: !ui.edit || !ui.editSelection.length },
+                                { id: 'neweditfromselection', title: Ox._('New Edit from Selection'), keyboard: 'shift control n', disabled: !ui.edit },
                                 { id: 'newsmartedit', title: Ox._('New Smart Edit'), keyboard: 'alt control n'},
                                 {},
                                 { id: 'duplicateedit', title: Ox._('Duplicate Selected Edit'), keyboard: 'control d', disabled: !ui.edit },
diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js
index e8830b136..9c1bc5a24 100644
--- a/static/js/mainMenu.js
+++ b/static/js/mainMenu.js
@@ -650,15 +650,12 @@ pandora.ui.mainMenu = function() {
                     that.uncheckItem(previousEdit == '' ? 'allitems' : 'viewlist' + previousEdit.replace(/_/g, Ox.char(9)));
                     that.checkItem(edit == '' ? 'allitems' : 'viewlist' + edit.replace(/_/g, '\t'));
                 }
-                that[edit ? 'enableItem' : 'disableItem']('duplicatelist');
+                that[!isGuest && edit ? 'enableItem' : 'disableItem']('duplicatelist');
                 that[action]('editlist');
                 that[action]('deletelist');
-                that[ui.listSelection.length ? 'enableItem' : 'disableItem']('newlistfromselection');
+                that[!isGuest && edit ? 'enableItem' : 'disableItem']('newlistfromselection');
                 that.replaceMenu('itemMenu', getItemMenu());
             },
-            pandora_editselection: function(data) {
-                that[data.value.length ? 'enableItem' : 'disableItem']('newlistfromselection');
-            },
             pandora_find: function() {
                 var action = pandora.getListData().editable ? 'enableItem' : 'disableItem',
                     list = ui._list,
@@ -998,7 +995,7 @@ pandora.ui.mainMenu = function() {
                 { id: 'neweditfromselection', title: Ox._('New Edit from Selection'), disabled: isGuest || ui.listSelection.length == 0 },
                 { id: 'newsmarteditfromresults', title: Ox._('New Smart Edit from Results'), disabled: isGuest }
             ] : ui.section == 'edits' ? [
-                { id: 'newlistfromselection', title: Ox._('New ' + itemNameSingular + ' from Selection'), disabled: isGuest || !ui.edit || ui.editSelection.length == 0, keyboard: 'shift control n' },
+                { id: 'newlistfromselection', title: Ox._('New ' + itemNameSingular + ' from Selection'), disabled: isGuest || !ui.edit, keyboard: 'shift control n' },
                 { id: 'newsmartlist', title: Ox._('New Smart ' + itemNameSingular), disabled: isGuest, keyboard: 'alt control n' }
             ] : [
                 { id: 'newpdf', title: Ox._('New PDF'), disabled: isGuest, keyboard: 'alt control n' },
diff --git a/static/js/utils.js b/static/js/utils.js
index dce16f608..f771e855b 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -38,7 +38,7 @@ pandora.addFolderItem = function(section) {
             if (!isSmart) {
                 data.items = isItems ? ui.listSelection
                     : ui.section == 'items' ? pandora.$ui.clipList.options('selected')
-                    : ui.editSelection;
+                    : pandora.$ui.editPanel.getSelectedClips();
             } else {
                 data.query = ui.find;
             }
@@ -446,7 +446,6 @@ pandora.createLinks = function($element) {
                 }
             });
         } else {
-
             pandora.api.addClips({
                 clips: getClipData(items),
                 edit: target,