diff --git a/views/settings.tpl b/views/settings.tpl
index d1662b3ee..e09bb5285 100644
--- a/views/settings.tpl
+++ b/views/settings.tpl
@@ -1073,6 +1073,7 @@
                                     <option value="subs">subs</option>
                                     <option value="subtitle">subtitle</option>
                                     <option value="subtitles">subtitles</option>
+                                    <option value="custom">Custom folder</option>
                                 </select>
                             </div>
 
@@ -1085,7 +1086,7 @@
                             </div>
                         </div>
 
-                        <div class="middle aligned row">
+                        <div class="middle aligned row subfolder">
                             <div class="right aligned four wide column">
                                 <label>Custom Subtitle folder</label>
                             </div>
@@ -2007,6 +2008,19 @@
         }
     });
 
+    if ($('#settings_subfolder').val() !== "custom") {
+        $('.subfolder').hide();
+    }
+
+    $('#settings_subfolder').dropdown('setting', 'onChange', function(){
+        if ($('#settings_subfolder').val() !== "custom") {
+            $('.subfolder').hide();
+        }
+        else {
+            $('.subfolder').show();
+        }
+    });
+
     if ($('#settings_auth_type').val() === "None") {
         $('.auth_option').hide();
     }