diff --git a/cmd/main-server.go b/cmd/main-server.go
index 4e8dfc7e..c1ab5f00 100644
--- a/cmd/main-server.go
+++ b/cmd/main-server.go
@@ -444,7 +444,11 @@ func main() {
 
 	err = sstore.HangupAllRunningCmds(context.Background())
 	if err != nil {
-		log.Printf("[error] calling HUP on all running commands\n")
+		log.Printf("[error] calling HUP on all running commands: %v\n", err)
+	}
+	err = sstore.ReInitFocus(context.Background())
+	if err != nil {
+		log.Printf("[error] resetting window focus: %v\n", err)
 	}
 
 	go stdinReadWatch()
diff --git a/pkg/sstore/dbops.go b/pkg/sstore/dbops.go
index 9c4b5a29..747aa4a7 100644
--- a/pkg/sstore/dbops.go
+++ b/pkg/sstore/dbops.go
@@ -784,6 +784,14 @@ func AppendCmdErrorPk(ctx context.Context, errPk *packet.CmdErrorPacketType) err
 	})
 }
 
+func ReInitFocus(ctx context.Context) error {
+	return WithTx(ctx, func(tx *TxWrap) error {
+		query := `UPDATE screen_window SET focustype = 'input'`
+		tx.ExecWrap(query)
+		return nil
+	})
+}
+
 func HangupAllRunningCmds(ctx context.Context) error {
 	return WithTx(ctx, func(tx *TxWrap) error {
 		query := `UPDATE cmd SET status = ? WHERE status = ?`