diff --git a/frontend/app/view/preview/preview-directory.tsx b/frontend/app/view/preview/preview-directory.tsx
index 0940ba43b3..d4a2eace4f 100644
--- a/frontend/app/view/preview/preview-directory.tsx
+++ b/frontend/app/view/preview/preview-directory.tsx
@@ -603,6 +603,14 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
                             modtime: new Date().getTime(),
                             mimetype: "directory",
                         });
+                    } else if (!finfo?.dir && finfo?.path) {
+                        entries.unshift({
+                            name: "..",
+                            path: "",
+                            isdir: true,
+                            modtime: new Date().getTime(),
+                            mimetype: "directory",
+                        });
                     }
                 } catch (e) {
                     console.error("Directory Read Error", e);
diff --git a/frontend/app/view/preview/preview-model.tsx b/frontend/app/view/preview/preview-model.tsx
index 8315e48b2a..b9c69f2d07 100644
--- a/frontend/app/view/preview/preview-model.tsx
+++ b/frontend/app/view/preview/preview-model.tsx
@@ -31,6 +31,10 @@ const BOOKMARKS: { label: string; path: string }[] = [
     { label: "Root", path: "/" },
 ];
 
+if (window.navigator?.platform?.startsWith("Win")) {
+    BOOKMARKS.push({ label: "Drives", path: "" });
+}
+
 const MaxFileSize = 1024 * 1024 * 10; // 10MB
 const MaxCSVSize = 1024 * 1024 * 1; // 1MB
 
@@ -207,7 +211,7 @@ export class PreviewModel implements ViewModel {
                 return {
                     elemtype: "iconbutton",
                     icon: "folder-open",
-                    longClick: (e: React.MouseEvent<any>) => {
+                    click: (e: React.MouseEvent<any>) => {
                         const menuItems: ContextMenuItem[] = BOOKMARKS.map((bookmark) => ({
                             label: `Go to ${bookmark.label} (${bookmark.path})`,
                             click: () => this.goHistory(bookmark.path),
@@ -315,7 +319,7 @@ export class PreviewModel implements ViewModel {
             }
             const mimeType = jotaiLoadableValue(get(this.fileMimeTypeLoadable), "");
             const metaPath = get(this.metaFilePath);
-            if (mimeType == "directory" && metaPath == "/") {
+            if (mimeType == "directory" && (metaPath == "/" || metaPath == "")) {
                 return null;
             }
             return {
@@ -379,7 +383,7 @@ export class PreviewModel implements ViewModel {
         });
         this.metaFilePath = atom<string>((get) => {
             const file = get(this.blockAtom)?.meta?.file;
-            if (isBlank(file)) {
+            if (file == null) {
                 return "~";
             }
             return file;
diff --git a/frontend/util/historyutil.ts b/frontend/util/historyutil.ts
index 73e4da201e..a41b0f7bef 100644
--- a/frontend/util/historyutil.ts
+++ b/frontend/util/historyutil.ts
@@ -5,22 +5,24 @@ import * as util from "@/util/util";
 
 const MaxHistory = 20;
 
-// this needs to be fixed for windows
 function getParentDirectory(path: string): string {
     if (util.isBlank(path) == null) {
-        // this not great, ideally we'd never be passed a null path
         return "/";
     }
-    if (path == "/") {
-        return "/";
+    if (path == "/" || path == "") {
+        return path;
     }
-    const splitPath = path.split("/");
+    const separator = path.includes("\\") ? "\\" : "/";
+    const splitPath = path.split(separator);
     splitPath.pop();
-    if (splitPath.length == 1 && splitPath[0] == "") {
-        return "/";
+    if (splitPath.length == 0 || (splitPath.length == 1 && splitPath[0] == "")) {
+        return separator == "\\" ? path.substring(0, 3) : "/";
+    }
+    const joined = splitPath.join(separator);
+    if (separator == "\\" && joined.length == 2 && joined[1] == ":") {
+        return joined + "\\";
     }
-    const newPath = splitPath.join("/");
-    return newPath;
+    return joined;
 }
 
 function goHistoryBack(curValKey: "url" | "file", curVal: string, meta: MetaType, backToParent: boolean): MetaType {
diff --git a/frontend/util/waveutil.ts b/frontend/util/waveutil.ts
index 4d0f5952fc..7944e54d09 100644
--- a/frontend/util/waveutil.ts
+++ b/frontend/util/waveutil.ts
@@ -91,5 +91,8 @@ export function computeBgStyleFromMeta(meta: Omit<BackgroundConfigType, "display
 
 export function formatRemoteUri(path: string, connection: string): string {
     connection = connection ?? "local";
+    if (path === "") {
+        return `wsh://${connection}`;
+    }
     return `wsh://${connection}/${path}`;
 }
diff --git a/pkg/wconfig/defaultconfig/settings.json b/pkg/wconfig/defaultconfig/settings.json
index d8847cabf2..19a0556106 100644
--- a/pkg/wconfig/defaultconfig/settings.json
+++ b/pkg/wconfig/defaultconfig/settings.json
@@ -5,7 +5,7 @@
     "ai:timeoutms": 60000,
     "app:defaultnewblock": "term",
     "app:tabbar": "top",
-    "app:confirmquit": true,
+    "app:confirmquit": false,
     "app:hideaibutton": false,
     "term:showsplitbuttons": false,
     "app:disablectrlshiftarrows": false,
@@ -27,7 +27,7 @@
     "window:magnifiedblockblurprimarypx": 10,
     "window:fullscreenonlaunch": false,
     "window:magnifiedblockblursecondarypx": 2,
-    "window:confirmclose": true,
+    "window:confirmclose": false,
     "window:savelastwindow": true,
     "telemetry:enabled": true,
     "term:bellsound": false,
diff --git a/pkg/wshrpc/wshremote/wshremote_file.go b/pkg/wshrpc/wshremote/wshremote_file.go
index f336b9d8bb..e6ea1fccc0 100644
--- a/pkg/wshrpc/wshremote/wshremote_file.go
+++ b/pkg/wshrpc/wshremote/wshremote_file.go
@@ -13,6 +13,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"time"
 
@@ -207,6 +208,18 @@ func (impl *ServerImpl) RemoteListEntriesCommand(ctx context.Context, data wshrp
 			panichandler.PanicHandler("RemoteListEntriesCommand", recover())
 		}()
 		defer close(ch)
+
+		if runtime.GOOS == "windows" && data.Path == "" {
+			drives, err := listDrives()
+			if err != nil {
+				ch <- wshutil.RespErr[wshrpc.CommandRemoteListEntriesRtnData](err)
+				return
+			}
+			resp := wshrpc.CommandRemoteListEntriesRtnData{FileInfo: drives}
+			ch <- wshrpc.RespOrErrorUnion[wshrpc.CommandRemoteListEntriesRtnData]{Response: resp}
+			return
+		}
+
 		path, err := wavebase.ExpandHomeDir(data.Path)
 		if err != nil {
 			ch <- wshutil.RespErr[wshrpc.CommandRemoteListEntriesRtnData](err)
@@ -327,6 +340,12 @@ func checkIsReadOnly(path string, fileInfo fs.FileInfo, exists bool) bool {
 
 func computeDirPart(path string) string {
 	path = filepath.Clean(wavebase.ExpandHomeDirSafe(path))
+	if runtime.GOOS == "windows" {
+		vol := filepath.VolumeName(path)
+		if vol != "" && path == vol+"\\" {
+			return ""
+		}
+	}
 	path = filepath.ToSlash(path)
 	if path == "/" {
 		return "/"
@@ -334,7 +353,35 @@ func computeDirPart(path string) string {
 	return filepath.Dir(path)
 }
 
+func listDrives() ([]*wshrpc.FileInfo, error) {
+	var drives []*wshrpc.FileInfo
+	for _, letter := range "ABCDEFGHIJKLMNOPQRSTUVWXYZ" {
+		drivePath := string(letter) + ":\\"
+		finfo, err := os.Stat(drivePath)
+		if err != nil {
+			continue
+		}
+		driveInfo := statToFileInfo(drivePath, finfo, false)
+		driveInfo.Name = string(letter) + ":"
+		drives = append(drives, driveInfo)
+	}
+	if len(drives) == 0 {
+		return nil, fmt.Errorf("no drives found")
+	}
+	return drives, nil
+}
+
 func (*ServerImpl) fileInfoInternal(path string, extended bool) (*wshrpc.FileInfo, error) {
+	if runtime.GOOS == "windows" && path == "" {
+		return &wshrpc.FileInfo{
+			Path:          "",
+			Dir:           "",
+			Name:          "Drives",
+			IsDir:         true,
+			MimeType:      "directory",
+			SupportsMkdir: false,
+		}, nil
+	}
 	cleanedPath := filepath.Clean(wavebase.ExpandHomeDirSafe(path))
 	finfo, err := os.Stat(cleanedPath)
 	if os.IsNotExist(err) {