diff --git a/IDE/src/ui/NewProjectDialog.bf b/IDE/src/ui/NewProjectDialog.bf
index 87fedd24..a3e10709 100644
--- a/IDE/src/ui/NewProjectDialog.bf
+++ b/IDE/src/ui/NewProjectDialog.bf
@@ -188,6 +188,9 @@ namespace IDE.ui
 			else
 				mDirBase = new String();
             mDirectoryEdit = new PathEditWidget(.Folder);
+			if (gApp.mWorkspace.mDir != null)
+				mDirectoryEdit.mDefaultFolderPath = new .(gApp.mWorkspace.mDir);
+
 			AddEdit(mDirectoryEdit);
 			mDirectoryEdit.mOnContentChanged.Add(new (dlg) =>
 				{
diff --git a/IDE/src/ui/PathEditWidget.bf b/IDE/src/ui/PathEditWidget.bf
index 96756491..1f407feb 100644
--- a/IDE/src/ui/PathEditWidget.bf
+++ b/IDE/src/ui/PathEditWidget.bf
@@ -75,7 +75,7 @@ namespace IDE.ui
 							String path = scope .();
 							GetText(path);
 
-							if (path.IsWhiteSpace)
+							if ((path.IsWhiteSpace) && (mDefaultFolderPath != null))
 								path.Set(mDefaultFolderPath);
 #if !CLI
 							FolderBrowserDialog folderDialog = scope .();