diff --git a/src/main.go b/src/main.go
index c3199e3..e51c54d 100644
--- a/src/main.go
+++ b/src/main.go
@@ -34,29 +34,34 @@ func main() {
 		log.Fatalf("Failed to create window: %v", err)
 	}
 
-	if flag.NArg() > 0 {
-		for i, file := range flag.Args() {
-			b, err := CreateFileBuffer(file, true)
-			if err != nil {
-				window.PrintMessage("Could not open file: "+file, TYPER_MESSAGE_ERROR)
-				continue
-			}
-
-			if i == 0 {
-				window.CurrentBuffer = b
-				Buffers = Buffers[1:]
-			}
-		}
-	}
-
 	// Create logs buffer
-	logsBuffer, err := CreateBuffer("Logs")
+	logsBuffer, err := CreateBuffer("Typer Logs")
 	if err != nil {
 		log.Fatalf("Could not create logs buffer")
 	}
 	logsBuffer.filetype = "typer_logs"
 	logsBuffer.canEdit = false
 
+	// Open paths passed as arguments
+	if flag.NArg() > 0 {
+		for _, file := range flag.Args() {
+			buffer, err := CreateFileBuffer(file, true)
+			if err != nil {
+				window.PrintMessage("Could not open file: "+file, TYPER_MESSAGE_ERROR)
+				continue
+			}
+
+			if window.CurrentBuffer == nil {
+				window.CurrentBuffer = buffer
+			}
+		}
+	} else {
+		buffer, err := CreateBuffer("New Buffer 1")
+		if err == nil {
+			window.CurrentBuffer = buffer
+		}
+	}
+
 	for !window.closed {
 		window.Draw()
 		window.ProcessEvents()
diff --git a/src/message_bar.go b/src/message_bar.go
index 1042cf0..5b46edb 100644
--- a/src/message_bar.go
+++ b/src/message_bar.go
@@ -27,7 +27,7 @@ var lastMessage *TyperMessage
 func (window *Window) PrintMessage(message string, urgency TyperMessageUrgency) {
 	lastMessage = &TyperMessage{Timestamp: time.Now().UnixMilli(), Message: message, Urgency: urgency}
 
-	logsBuffer := GetBufferByName("Logs")
+	logsBuffer := GetBufferByName("Typer Logs")
 	if logsBuffer != nil {
 		messageToPrint := ""
 		switch lastMessage.Urgency {
diff --git a/src/window.go b/src/window.go
index d45c765..3771711 100644
--- a/src/window.go
+++ b/src/window.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"slices"
-	"strconv"
 	"strings"
 	"time"
 	"typer/runestring"
@@ -57,14 +56,6 @@ func CreateWindow() (*Window, error) {
 		screen: nil,
 	}
 
-	// Create empty buffer if nil
-	for i := 1; window.CurrentBuffer == nil; i++ {
-		buffer, err := CreateBuffer("New Buffer " + strconv.Itoa(i))
-		if err == nil {
-			window.CurrentBuffer = buffer
-		}
-	}
-
 	// Create tcell screen
 	screen, err := tcell.NewScreen()
 	if err != nil {