diff --git a/CHANGELOG b/CHANGELOG
index cf065224..695972e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,8 @@ https://dev.louiz.org/projects/poezio/roadmap
 - Only send an unavailable presence on closing a room if we are joined.
 - Don’t display the current date for history messages received today.
 - Fix marquee and dice plugin to use newer Last Message Correction format.
+- Bookmarks tab properly displays bookmarks method (local/remote) and allows
+  to switch between them again.
 
 # Forgotten additions
 
diff --git a/poezio/windows/bookmark_forms.py b/poezio/windows/bookmark_forms.py
index 28cab8ec..d538e6a2 100644
--- a/poezio/windows/bookmark_forms.py
+++ b/poezio/windows/bookmark_forms.py
@@ -269,7 +269,7 @@ class BookmarksWin(Win):
             self.current_horizontal_input].set_color(
                 theme.COLOR_NORMAL_TEXT)
         self.current_horizontal_input += 1
-        if self.current_horizontal_input > 3:
+        if self.current_horizontal_input > 4:
             self.current_horizontal_input = 0
         self.lines[self.current_input][
             self.current_horizontal_input].set_color(
@@ -363,7 +363,7 @@ class BookmarksWin(Win):
                 continue
             if i >= self.height + self.scroll_pos:
                 break
-            for j in range(4):
+            for j in range(5):
                 inp[j].refresh()
 
         if self.lines and self.current_input < self.height - 1: