diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index 7eb91fffa..592885721 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -18,18 +18,18 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
         if (path && typeof path !== 'string') {
             throw new Error("invalid path");
         }
-        
+
         loading.show();
-        
+
         var promises = [];
 
         if ("Network" === path) {
             promises.push(ApiClient.getNetworkDevices())
         } else {
-            if (path) { 
+            if (path) {
                 promises.push(ApiClient.getDirectoryContents(path, fileOptions));
                 promises.push(ApiClient.getParentPath(path));
-            } else { 
+            } else {
                 promises.push(ApiClient.getDrives());
             }
         }
@@ -42,7 +42,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
 
                 page.querySelector(".results").scrollTop = 0;
                 page.querySelector("#txtDirectoryPickerPath").value = path || "";
-                
+
                 if (path) {
                     html += getItem("lnkPath lnkDirectory", "", parentPath, "...");
                 }
@@ -51,7 +51,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
                     var cssClass = "File" === folder.Type ? "lnkPath lnkFile" : "lnkPath lnkDirectory";
                     html += getItem(cssClass, folder.Type, folder.Path, folder.Name);
                 }
-                
+
                 if (!path) {
                     html += getItem("lnkPath lnkDirectory", "", "Network", Globalize.translate("ButtonNetwork"));
                 }
@@ -128,17 +128,9 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
             html += '<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="' + Globalize.translate("ButtonRefresh") + '"><i class="md-icon">search</i></button>';
         }
         html += "</div>";
-        if (!readOnlyAttribute) { 
+        if (!readOnlyAttribute) {
             html += '<div class="results paperList" style="max-height: 200px; overflow-y: auto;"></div>';
         }
-        if (options.enableNetworkSharePath) {
-            html += '<div class="inputContainer" style="margin-top:2em;">';
-            html += '<input is="emby-input" id="txtNetworkPath" type="text" label="' + Globalize.translate("LabelOptionalNetworkPath") + '"/>';
-            html += '<div class="fieldDescription">';
-            html += Globalize.translate("LabelOptionalNetworkPathHelp");
-            html += "</div>";
-            html += "</div>";
-        }
         html += '<div class="formDialogFooter">';
         html += '<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">' + Globalize.translate("ButtonOk") + "</button>";
         html += "</div>";
@@ -219,14 +211,8 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
 
         content.querySelector("form").addEventListener("submit", function(e) {
             if (options.callback) {
-                var networkSharePath = this.querySelector("#txtNetworkPath");
-                networkSharePath = networkSharePath ? networkSharePath.value : null;
                 var path = this.querySelector("#txtDirectoryPickerPath").value;
-                validatePath(path, options.validateWriteable, ApiClient).then(
-                    function() {
-                        options.callback(path, networkSharePath);
-                    }
-                );
+                validatePath(path, options.validateWriteable, ApiClient).then(options.callback(path));
             }
             e.preventDefault();
             e.stopPropagation();
@@ -293,10 +279,6 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'emby-b
                     });
                     currentDialog = dlg;
                     dlg.querySelector("#txtDirectoryPickerPath").value = initialPath;
-                    var txtNetworkPath = dlg.querySelector("#txtNetworkPath");
-                    if (txtNetworkPath) {
-                        txtNetworkPath.value = options.networkSharePath || "";
-                    }
                     if (!options.pathReadOnly) {
                         refreshDirectoryBrowser(dlg, initialPath, fileOptions, true);
                     }
diff --git a/src/dashboard/dashboardgeneral.js b/src/dashboard/dashboardgeneral.js
index 760ae087a..027fba999 100644
--- a/src/dashboard/dashboardgeneral.js
+++ b/src/dashboard/dashboardgeneral.js
@@ -74,16 +74,29 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
                 var picker = new directoryBrowser;
                 picker.show({
                     path: $("#txtMetadataPath", view).val(),
-                    networkSharePath: $("#txtMetadataNetworkPath", view).val(),
-                    callback: function(path, networkPath) {
+                    callback: function(path) {
                         path && $("#txtMetadataPath", view).val(path);
-                        networkPath && $("#txtMetadataNetworkPath", view).val(networkPath);
                         picker.close();
                     },
                     validateWriteable: true,
                     header: Globalize.translate("HeaderSelectMetadataPath"),
-                    instruction: Globalize.translate("HeaderSelectMetadataPathHelp"),
-                    enableNetworkSharePath: true
+                    instruction: Globalize.translate("HeaderSelectMetadataPathHelp")
+                })
+            })
+        });
+
+        $("#btnSelectMetadataNetworkPath", view).on("click.selectDirectory", function() {
+            require(["directorybrowser"], function(directoryBrowser) {
+                var picker = new directoryBrowser;
+                picker.show({
+                    path: $("#txtMetadataNetworkPath", view).val(),
+                    callback: function(path) {
+                        path && $("#txtMetadataNetworkPath", view).val(path);
+                        picker.close();
+                    },
+                    validateWriteable: true,
+                    header: Globalize.translate("LabelOptionalNetworkPath"),
+                    instruction: Globalize.translate("LabelOptionalNetworkPathHelp")
                 })
             })
         });
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index a31db79d6..4c56fa300 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -44,6 +44,7 @@
                         </div>
                         <div class="fieldDescription">${LabelCachePathHelp}</div>
                     </div>
+
                     <div class="inputContainer">
                         <div style="display: flex; align-items: center;">
                             <div style="flex-grow:1;">
@@ -52,7 +53,16 @@
                             <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><i class="md-icon">search</i></button>
                         </div>
                         <div class="fieldDescription">${LabelMetadataPathHelp}</div>
-                        <input type="hidden" id="txtMetadataNetworkPath" />
+                    </div>
+
+                    <div class="inputContainer">
+                        <div style="display: flex; align-items: center;">
+                            <div style="flex-grow:1;">
+                                <input is="emby-input" id="txtMetadataNetworkPath" label="${LabelOptionalNetworkPath}" autocomplete="off" />
+                            </div>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectMetadataNetworkPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><i class="md-icon">search</i></button>
+                        </div>
+                        <div class="fieldDescription">${LabelOptionalNetworkPathHelp}</div>
                     </div>
                 </div>
 
@@ -72,7 +82,7 @@
                 </div>
 
                 <div class="verticalSection">
-                    <h2>${TabOther}</h2>
+                    <h2>${HeaderBranding}</h2>
                     <div class="inputContainer">
                         <input is="emby-input" type="text" id="txtLoginDisclaimer" label="${LabelLoginDisclaimer}" />
                         <div class="fieldDescription">${LabelLoginDisclaimerHelp}</div>