diff --git a/internal/client/ui/core/core.go b/internal/client/ui/core/core.go
index f560fff..b352226 100644
--- a/internal/client/ui/core/core.go
+++ b/internal/client/ui/core/core.go
@@ -511,7 +511,6 @@ func (m *Model) move(direction int) {
 		m.chat.Focus()
 	case FocusRightSidebar:
 		m.networkList.Blur()
-		m.memberList.Blur()
 		m.frequencyList.Blur()
 		m.chat.Blur()
 		m.memberList.Focus()
diff --git a/internal/client/ui/core/memberlist/memberlist.go b/internal/client/ui/core/memberlist/memberlist.go
index b67550d..369fc9d 100644
--- a/internal/client/ui/core/memberlist/memberlist.go
+++ b/internal/client/ui/core/memberlist/memberlist.go
@@ -57,7 +57,7 @@ func New() Model {
 		index:          -1,
 		focus:          false,
 		width:          -1,
-		height:         1,
+		height:         -1,
 	}
 }
 
@@ -204,7 +204,9 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 
 func (m *Model) Focus() {
 	m.focus = true
-	m.SetIndex(0)
+	if m.index == -1 {
+		m.SetIndex(0)
+	}
 }
 
 func (m *Model) Blur() {