diff --git a/.gitignore b/.gitignore
index 6d9b25784..9b0ebaef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ test/git_server/data
 test/_results/**
 
 oryxBuildBinary
-__debug_bin
+__debug_bin*
 
 .worktrees
 demo/output/*
diff --git a/pkg/app/daemon/daemon.go b/pkg/app/daemon/daemon.go
index 16b9bf5e5..6b29fd62d 100644
--- a/pkg/app/daemon/daemon.go
+++ b/pkg/app/daemon/daemon.go
@@ -76,8 +76,6 @@ func Handle(common *common.Common) {
 	if err := instruction.run(common); err != nil {
 		log.Fatal(err)
 	}
-
-	os.Exit(0)
 }
 
 func InDaemonMode() bool {
diff --git a/pkg/app/entry_point.go b/pkg/app/entry_point.go
index a812154fe..498abc7fe 100644
--- a/pkg/app/entry_point.go
+++ b/pkg/app/entry_point.go
@@ -124,7 +124,11 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 		os.Exit(0)
 	}
 
-	tempDir, err := os.MkdirTemp("", "lazygit-*")
+	tmpDirBase := filepath.Join(os.TempDir(), "lazygit")
+	if err := os.MkdirAll(tmpDirBase, 0o700); err != nil {
+		log.Fatal(err.Error())
+	}
+	tempDir, err := os.MkdirTemp(tmpDirBase, "")
 	if err != nil {
 		log.Fatal(err.Error())
 	}