diff --git a/src/css/3p-filters.css b/src/css/3p-filters.css
index 8d2e129b1..7b30a2269 100644
--- a/src/css/3p-filters.css
+++ b/src/css/3p-filters.css
@@ -140,10 +140,10 @@ span.new {
     background-color: hsl(36, 100%, 75%);
     }
 #externalListsDiv {
-    margin: 2em auto 0 2em;
+    margin: 2em auto 0 1em;
     }
 body[dir=rtl] #externalListsDiv {
-    margin: 2em 2em 0;
+    margin: 2em 1em 0;
     }
 #externalLists {
     box-sizing: border-box;
diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js
index 9a89fd690..8169b9d54 100644
--- a/src/js/3p-filters.js
+++ b/src/js/3p-filters.js
@@ -76,6 +76,9 @@ var renderFilterLists = function() {
     var renderElapsedTimeToString = vAPI.i18n.renderElapsedTimeToString;
     var lastUpdateString = vAPI.i18n('3pLastUpdate');
 
+    // Don't lose the custom filter textbox
+    uDom('#templates').append(uDom('#externalListsDiv'));
+
     // Assemble a pretty blacklist name if possible
     var listNameFromListKey = function(listKey) {
         if ( listKey === listDetails.userFiltersPath ) {
diff --git a/src/js/background.js b/src/js/background.js
index 4d6da24d2..e2a543a3f 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -74,8 +74,7 @@ return {
         'behind-the-scene',
         'chrome-extension-scheme',
         'chrome-scheme',
-        'opera-scheme',
-        ''
+        'opera-scheme'
     ].join('\n').trim(),
 
     localSettings: {