diff --git a/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs
index 70d2657e37a..0cd771d46a4 100644
--- a/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/NewPlusViewModel.cs
@@ -261,7 +261,7 @@ private void OpenNewTemplateFolder()
         private async void PickNewTemplateFolder()
         {
             var newPath = await PickFolderDialog();
-            if (newPath.Length > 1)
+            if (!string.IsNullOrEmpty(newPath))
             {
                 TemplateLocation = newPath;
             }
@@ -270,8 +270,7 @@ private async void PickNewTemplateFolder()
         private async Task<string> PickFolderDialog()
         {
             var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.GetSettingsWindow());
-            string pathFolder = await Task.FromResult<string>(ShellGetFolder.GetFolderDialogWithFlags(hwnd, ShellGetFolder.FolderDialogFlags._BIF_NEWDIALOGSTYLE));
-            return pathFolder;
+            return await Task.FromResult(GetFolderDialogWithFlags(hwnd, FolderDialogFlags._BIF_NEWDIALOGSTYLE));
         }
 
         private void SaveSettingsToJson()