diff --git a/BeefLibs/Beefy2D/src/widgets/ListView.bf b/BeefLibs/Beefy2D/src/widgets/ListView.bf
index 839cc575..6a2f6900 100644
--- a/BeefLibs/Beefy2D/src/widgets/ListView.bf
+++ b/BeefLibs/Beefy2D/src/widgets/ListView.bf
@@ -957,8 +957,10 @@ namespace Beefy.widgets
 					}
 					triedMove = true;
                 case KeyCode.Down:
-                    if (selectedItem.IsOpen)
+                    if ((selectedItem.IsOpen) && (!selectedItem.mChildItems.IsEmpty))
+					{
                         newSelection = selectedItem.mChildItems[0];
+					}
                     else
                     {
                         while (selectedItem != mRoot)
diff --git a/IDE/src/ui/ProjectPanel.bf b/IDE/src/ui/ProjectPanel.bf
index 98891943..480920f2 100644
--- a/IDE/src/ui/ProjectPanel.bf
+++ b/IDE/src/ui/ProjectPanel.bf
@@ -2353,12 +2353,7 @@ namespace IDE.ui
         {
             ListViewItem selectedListViewItem = mListView.GetRoot().FindFocusedItem();           
             if (selectedListViewItem != null)
-            {
-                ProjectItem projectItem;
-                mListViewToProjectMap.TryGetValue(selectedListViewItem, out projectItem);
-				if (projectItem != null)
-                	RenameItem(projectItem);
-            }
+				EditListViewItem(selectedListViewItem);
         }
 
 		bool IsWorkspaceFolderNameUnique(String name, ListViewItem currentItem = null)
@@ -2381,10 +2376,12 @@ namespace IDE.ui
 		    parentListViewItem.mOpenButton?.Open(true, false);
 
 			String name = new .(16);
-			int32 checkIdx = 1;
+			int32 checkIdx = 0;
 			repeat
 			{
-				name..Clear().AppendF($"New Folder {checkIdx}");
+				name..Clear().AppendF($"New folder");
+				if (checkIdx > 0)
+					name.AppendF("{}", checkIdx + 1);
 				checkIdx++;
 			}
 			while(!IsWorkspaceFolderNameUnique(name));
@@ -2407,7 +2404,6 @@ namespace IDE.ui
 		}
 
 
-
 		public Project ImportProject(String filePath, VerSpec verSpec = .None)
 		{
 			if (!File.Exists(filePath))
@@ -2603,7 +2599,7 @@ namespace IDE.ui
 					anItem = menu.AddItem("Rename");
 					anItem.mOnMenuItemSelected.Add(new (item) => { EditListViewItem(focusedItem); });
 					menu.AddItem();
-					anItem = menu.AddItem("Add Workspace Folder");
+					anItem = menu.AddItem("New Folder");
 					anItem.mOnMenuItemSelected.Add(new (item) => { AddWorkspaceFolder(folder.mListView); });
 					handled = true;
 				}
@@ -2621,8 +2617,7 @@ namespace IDE.ui
 					anItem = menu.AddItem("Add From Installed...");
 					anItem.mOnMenuItemSelected.Add(new (item) => { mImportInstalledDeferred = true; });
 
-					menu.AddItem();
-					anItem = menu.AddItem("Add Workspace Folder");
+					anItem = menu.AddItem("New Folder");
 					anItem.mOnMenuItemSelected.Add(new (item) => { AddWorkspaceFolder((ProjectListViewItem)mListView.GetRoot()); });
 					menu.AddItem();
 	                anItem = menu.AddItem("Properties...");