diff --git a/ui/browsing/browsingpane.go b/ui/browsing/browsingpane.go
index 091d5bd..7bd6011 100644
--- a/ui/browsing/browsingpane.go
+++ b/ui/browsing/browsingpane.go
@@ -127,7 +127,9 @@ func (b *BrowsingPane) EnableNavigationButtons() {
 func (b *BrowsingPane) ActivateNavigationButton(num int) {
 	if num < len(b.navBtnsContainer.Objects) {
 		btn := b.navBtnsContainer.Objects[num].(*widget.Button)
-		btn.OnTapped()
+		if !btn.Disabled() {
+			btn.OnTapped()
+		}
 	}
 }
 
diff --git a/ui/mainwindow.go b/ui/mainwindow.go
index 3347e44..99475d8 100644
--- a/ui/mainwindow.go
+++ b/ui/mainwindow.go
@@ -84,6 +84,7 @@ func NewMainWindow(fyneApp fyne.App, appName string, app *backend.App, size fyne
 	})
 	m.BrowsingPane.AddSettingsMenuItem("Log Out", app.ServerManager.Logout)
 	m.addNavigationButtons()
+	m.BrowsingPane.DisableNavigationButtons()
 	m.addShortcuts()
 	return m
 }