diff --git a/src/main/frontend/components/reference.cljs b/src/main/frontend/components/reference.cljs
index 562f10861..038880b17 100644
--- a/src/main/frontend/components/reference.cljs
+++ b/src/main/frontend/components/reference.cljs
@@ -68,7 +68,8 @@
                        :else
                        (db/get-page-referenced-blocks page-name))
           scheduled-or-deadlines (if (and journal?
-                                          (not (true? (state/scheduled-deadlines-disabled?))))
+                                          (not (true? (state/scheduled-deadlines-disabled?)))
+                                          (= page-name (string/lower-case (date/journal-name))))
                                    (db/get-date-scheduled-or-deadlines (string/capitalize page-name))
                                    nil)
           references (db/get-page-linked-refs-refed-pages repo page-name)
@@ -85,8 +86,7 @@
          [:div.content
           (when (seq scheduled-or-deadlines)
             (ui/foldable
-             [:h2.font-bold.opacity-50 (let []
-                                         "SCHEDULED AND DEADLINE")]
+             [:h2.font-bold.opacity-50 "SCHEDULED AND DEADLINE"]
              [:div.references-blocks.mb-6
               (let [ref-hiccup (block/->hiccup scheduled-or-deadlines
                                                {:id (str page-name "-agenda")
diff --git a/src/main/frontend/components/repo.cljs b/src/main/frontend/components/repo.cljs
index b6adc7dab..bc7e60373 100644
--- a/src/main/frontend/components/repo.cljs
+++ b/src/main/frontend/components/repo.cljs
@@ -209,8 +209,9 @@
               {:title (get-repo-name url)
                :options {:on-click (fn []
                                      (repo-handler/push-if-auto-enabled! (state/get-current-repo))
-
                                      (state/set-current-repo! url)
+                                     ;; load config
+                                     (common-handler/reset-config! url nil)
                                      (when-not (= :draw (state/get-current-route))
                                        (route-handler/redirect-to-home!))
                                      (when on-click