diff --git a/src/main/frontend/components/container.cljs b/src/main/frontend/components/container.cljs
index 81d708190fe..27208958639 100644
--- a/src/main/frontend/components/container.cljs
+++ b/src/main/frontend/components/container.cljs
@@ -139,9 +139,11 @@
   [t]
   (let [favorites (->> (:favorites (state/sub-config))
                        (remove string/blank?)
-                       (filter string?))
+                       (filter string?)
+                       (mapv util/safe-page-name-sanity-lc)
+                       (distinct))
         favorite-entities (->> favorites
-                               (mapv #(db/entity [:block/name (util/safe-page-name-sanity-lc %)]))
+                               (mapv #(db/entity [:block/name %]))
                                (remove nil?))]
     (nav-content-item
      [:a.flex.items-center.text-sm.font-medium.rounded-md.wrap-th
diff --git a/src/main/frontend/components/container.css b/src/main/frontend/components/container.css
index c09504d8e5c..7db910e713c 100644
--- a/src/main/frontend/components/container.css
+++ b/src/main/frontend/components/container.css
@@ -653,13 +653,10 @@ html[data-theme='dark'] {
     min-height: 100px;
 
     .sidebar-item-header {
-      white-space: nowrap;
-
       .breadcrumb {
         margin-top: 0;
         margin-bottom: 0;
-        text-overflow: ellipsis;
-        overflow: hidden;
+        text-align: left;
       }
     }
 
diff --git a/src/main/frontend/components/right_sidebar.cljs b/src/main/frontend/components/right_sidebar.cljs
index 738c5a9f9b8..765b6b5062c 100644
--- a/src/main/frontend/components/right_sidebar.cljs
+++ b/src/main/frontend/components/right_sidebar.cljs
@@ -266,10 +266,12 @@
                               (context-menu-content db-id idx block-type collapsed? block-count close-fn)))
                [:button.button.close {:title (t :right-side-bar/pane-close)
                                       :on-click #(state/sidebar-remove-block! idx)} (ui/icon "x")]]]
-             [:div.scrollbar-spacing.p-4 {:role "region"
+             [:div.pt-4.p-1 {:role "region"
                                           :id (str "sidebar-panel-content-" idx)
                                           :aria-labelledby (str "sidebar-panel-header-" idx)
-                                          :class (if collapsed? "hidden" "initial")}
+                                          :class (util/classnames [{:hidden collapsed?
+                                                                    :initial (not collapsed?)
+                                                                    :p-4 (not (contains? #{:page :block :contents} block-type))}])}
               (inner-component component (not drag-from))]
              (when drag-from (drop-area idx))])]
          (drop-indicator idx drag-to)]))))
diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs
index 40921f0a5e7..757c3e6f046 100644
--- a/src/main/frontend/handler/page.cljs
+++ b/src/main/frontend/handler/page.cljs
@@ -662,6 +662,7 @@
                          (concat (drop-last prev) [from (last prev)] next)
                          (concat prev [from] next))
                        (remove nil?)
+                       (mapv util/safe-page-name-sanity-lc)
                        distinct
                        vec)]
         (config-handler/set-config! :favorites favorites)))))