diff --git a/backend/config.go b/backend/config.go
index 6ae8741..47e6fe3 100644
--- a/backend/config.go
+++ b/backend/config.go
@@ -25,9 +25,10 @@ type ServerConnection struct {
 
 type ServerConfig struct {
 	ServerConnection
-	ID       uuid.UUID
-	Nickname string
-	Default  bool
+	ID              uuid.UUID
+	Nickname        string
+	Default         bool
+	SelectedLibrary string
 }
 
 type AppConfig struct {
diff --git a/backend/servermanager.go b/backend/servermanager.go
index 4cb23de..e37c8d0 100644
--- a/backend/servermanager.go
+++ b/backend/servermanager.go
@@ -29,7 +29,7 @@ type ServerManager struct {
 	appName           string
 	appVersion        string
 	config            *Config
-	onServerConnected []func()
+	onServerConnected []func(*ServerConfig)
 	onLogout          []func()
 }
 
@@ -62,7 +62,7 @@ func (s *ServerManager) ConnectToServer(conf *ServerConfig, password string) err
 	s.ServerID = conf.ID
 	s.SetDefaultServer(s.ServerID)
 	for _, cb := range s.onServerConnected {
-		cb()
+		cb(conf)
 	}
 	return nil
 }
@@ -152,7 +152,7 @@ func (s *ServerManager) deleteServerPassword(serverID uuid.UUID) {
 }
 
 // Sets a callback that is invoked when a server is connected to.
-func (s *ServerManager) OnServerConnected(cb func()) {
+func (s *ServerManager) OnServerConnected(cb func(*ServerConfig)) {
 	s.onServerConnected = append(s.onServerConnected, cb)
 }
 
diff --git a/ui/mainwindow.go b/ui/mainwindow.go
index ef49b2f..ef21795 100644
--- a/ui/mainwindow.go
+++ b/ui/mainwindow.go
@@ -94,8 +94,8 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string,
 	app.PlaybackManager.OnSongChange(func(item mediaprovider.MediaItem, _ *mediaprovider.Track) {
 		fyne.Do(func() { m.UpdateOnTrackChange(item) })
 	})
-	app.ServerManager.OnServerConnected(func() {
-		go m.RunOnServerConnectedTasks(app, displayAppName)
+	app.ServerManager.OnServerConnected(func(conf *backend.ServerConfig) {
+		go m.RunOnServerConnectedTasks(conf, app, displayAppName)
 	})
 	app.ServerManager.OnLogout(func() {
 		m.BrowsingPane.DisableNavigationButtons()
@@ -225,7 +225,7 @@ func (m *MainWindow) StartupPage() controller.Route {
 	}
 }
 
-func (m *MainWindow) RunOnServerConnectedTasks(app *backend.App, displayAppName string) {
+func (m *MainWindow) RunOnServerConnectedTasks(serverConf *backend.ServerConfig, app *backend.App, displayAppName string) {
 	time.Sleep(1 * time.Millisecond) // ensure this runs after sync tasks
 
 	if app.Config.Application.SavePlayQueue {
@@ -237,6 +237,7 @@ func (m *MainWindow) RunOnServerConnectedTasks(app *backend.App, displayAppName
 	}
 
 	doSetLibrary := func(libraryID string, menuIdx int) {
+		serverConf.SelectedLibrary = libraryID
 		fyne.Do(func() {
 			m.App.ServerManager.Server.SetLibrary(libraryID)
 			// Pages in the history could contain content
@@ -267,6 +268,9 @@ func (m *MainWindow) RunOnServerConnectedTasks(app *backend.App, displayAppName
 			}))
 		libraryMenuItemOffset = 1
 	}
+
+	initialLibraryMenuIdx := 0
+	initialLibraryID := ""
 	for i, l := range libraries {
 		_l := l
 		_i := i + libraryMenuItemOffset
@@ -274,11 +278,19 @@ func (m *MainWindow) RunOnServerConnectedTasks(app *backend.App, displayAppName
 			fyne.NewMenuItem(_l.Name, func() {
 				doSetLibrary(_l.ID, _i)
 			}))
+		if _l.ID == serverConf.SelectedLibrary {
+			initialLibraryMenuIdx = _i
+			initialLibraryID = _l.ID
+		}
 	}
 	m.librarySubmenu = libraryMenu
-	m.librarySubmenu.Items[0].Checked = true
+	m.librarySubmenu.Items[initialLibraryMenuIdx].Checked = true
 	m.BrowsingPane.SetSubmenuForMenuItem(lang.L("Select Library"), libraryMenu)
 
+	if initialLibraryID != "" {
+		m.App.ServerManager.Server.SetLibrary(initialLibraryID)
+	}
+
 	fyne.Do(func() {
 		m.BrowsingPane.EnableNavigationButtons()
 		m.Router.NavigateTo(m.StartupPage())