diff --git a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemView.js b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemView.js
index cb308ea56..75a39e2b5 100644
--- a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemView.js
+++ b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemView.js
@@ -39,7 +39,7 @@ module.exports = Marionette.ItemView.extend({
     },
 
     _add : function(e) {
-        if ($(e.target).closest('.btn,.btn-group').length !== 0) {
+        if ($(e.target).closest('.btn,.btn-group').length !== 0 && $(e.target).closest('.x-custom').length === 0) {
             return;
         }
 
diff --git a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
index 0b50d028e..66e1fb9c4 100644
--- a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
@@ -4,6 +4,9 @@
     </div>
     <div class="pull-right">
         {{#if_gt presets.length compare=0}}
+        <button class="btn btn-xs btn-default x-custom">
+            Custom
+        </button>
         <div class="btn-group">
             <button class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
                 Presets
diff --git a/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs b/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
index 8e51fc94c..ad246382c 100644
--- a/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
@@ -4,6 +4,10 @@
         <h3>Add Indexer</h3>
     </div>
     <div class="modal-body">
+        <div class="alert alert-info">
+            Sonarr supports any indexer that uses the Newznab standard, as well as other indexers listed below.<br/>
+            For more information on the individual indexers, clink on the info buttons.
+        </div>
         <div class="add-indexer add-thingies">
             <ul class="items"></ul>
         </div>
diff --git a/src/UI/Settings/Indexers/Add/IndexerAddItemView.js b/src/UI/Settings/Indexers/Add/IndexerAddItemView.js
index 662e102be..3a8b0493a 100644
--- a/src/UI/Settings/Indexers/Add/IndexerAddItemView.js
+++ b/src/UI/Settings/Indexers/Add/IndexerAddItemView.js
@@ -28,7 +28,7 @@ module.exports = Marionette.ItemView.extend({
     },
 
     _add : function(e) {
-        if ($(e.target).closest('.btn,.btn-group').length !== 0) {
+        if ($(e.target).closest('.btn,.btn-group').length !== 0 && $(e.target).closest('.x-custom').length === 0) {
             return;
         }
 
diff --git a/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs b/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
index 0b50d028e..66e1fb9c4 100644
--- a/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
@@ -4,6 +4,9 @@
     </div>
     <div class="pull-right">
         {{#if_gt presets.length compare=0}}
+        <button class="btn btn-xs btn-default x-custom">
+            Custom
+        </button>
         <div class="btn-group">
             <button class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
                 Presets
diff --git a/src/UI/Settings/Notifications/Add/NotificationAddItemView.js b/src/UI/Settings/Notifications/Add/NotificationAddItemView.js
index c82a94eeb..c5dc8ff00 100644
--- a/src/UI/Settings/Notifications/Add/NotificationAddItemView.js
+++ b/src/UI/Settings/Notifications/Add/NotificationAddItemView.js
@@ -41,7 +41,7 @@ module.exports = Marionette.ItemView.extend({
     },
 
     _add : function(e) {
-        if ($(e.target).closest('.btn,.btn-group').length !== 0) {
+        if ($(e.target).closest('.btn,.btn-group').length !== 0 && $(e.target).closest('.x-custom').length === 0) {
             return;
         }
 
diff --git a/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs b/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs
index 0b50d028e..66e1fb9c4 100644
--- a/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs
@@ -4,6 +4,9 @@
     </div>
     <div class="pull-right">
         {{#if_gt presets.length compare=0}}
+        <button class="btn btn-xs btn-default x-custom">
+            Custom
+        </button>
         <div class="btn-group">
             <button class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
                 Presets