diff --git a/src/main/frontend/components/container.cljs b/src/main/frontend/components/container.cljs
index b076164bf..d030a80b6 100644
--- a/src/main/frontend/components/container.cljs
+++ b/src/main/frontend/components/container.cljs
@@ -511,9 +511,6 @@
       {:tabIndex "-1"
        :data-is-margin-less-pages margin-less-pages?}
 
-      (when (util/electron?)
-        (find-in-page/search))
-
       (when show-action-bar?
         (action-bar/action-bar))
 
@@ -783,6 +780,9 @@
                         :default-home   default-home
                         :new-block-mode new-block-mode})
 
+        (when (util/electron?)
+          (find-in-page/search))
+
         (main {:route-match         route-match
                :margin-less-pages?  margin-less-pages?
                :logged?             logged?
diff --git a/src/main/frontend/components/find_in_page.cljs b/src/main/frontend/components/find_in_page.cljs
index 703830d77..6bb469d80 100644
--- a/src/main/frontend/components/find_in_page.cljs
+++ b/src/main/frontend/components/find_in_page.cljs
@@ -50,7 +50,7 @@
       :on-hide (fn []
                  (search-handler/electron-exit-find-in-page!)))))
   [{:keys [matches match-case? q]}]
-  [:div#search-in-page.flex.flex-row.absolute.top-2.right-4.shadow-lg.px-2.py-1.faster-fade-in.items-center
+  [:div#search-in-page.flex.flex-row.absolute.top-10.right-4.shadow-lg.px-2.py-1.faster-fade-in.items-center
 
    (search-input q matches)
 
diff --git a/src/main/frontend/components/search.cljs b/src/main/frontend/components/search.cljs
index 39733bd44..2c9755aa1 100644
--- a/src/main/frontend/components/search.cljs
+++ b/src/main/frontend/components/search.cljs
@@ -317,16 +317,17 @@
        :page-content
        (let [{:block/keys [snippet uuid]} data  ;; content here is normalized
              repo (state/sub :git/current-repo)
-             page (model/query-block-by-uuid uuid)  ;; it's actually a page
+             page (when uuid (model/query-block-by-uuid uuid))  ;; it's actually a page
              format (db/get-page-format page)]
-         [:span {:data-block-ref uuid}
-          (search-result-item {:name "page"
-                               :title (t :search-item/page)
-                               :extension? true}
-                              (if page
-                                (page-content-search-result-item repo uuid format snippet search-q search-mode)
-                                (do (log/error "search result with non-existing uuid: " data)
-                                    (str "Cache is outdated. Please click the 'Re-index' button in the graph's dropdown menu."))))])
+         (when page
+           [:span {:data-block-ref uuid}
+            (search-result-item {:name "page"
+                                 :title (t :search-item/page)
+                                 :extension? true}
+                                (if page
+                                  (page-content-search-result-item repo uuid format snippet search-q search-mode)
+                                  (do (log/error "search result with non-existing uuid: " data)
+                                      (str "Cache is outdated. Please click the 'Re-index' button in the graph's dropdown menu."))))]))
 
        nil)]))
 
diff --git a/src/main/frontend/ui.cljs b/src/main/frontend/ui.cljs
index b0060f650..6df7990a0 100644
--- a/src/main/frontend/ui.cljs
+++ b/src/main/frontend/ui.cljs
@@ -69,11 +69,11 @@
   [:div.flex.flex-row.justify-between.py-1.px-2.items-center
    [:div.flex.flex-row.justify-between.flex-1.mx-2.mt-2
     (for [color block-background-colors]
-      [:a.shadow-sm
+      [:a
        {:title (t (keyword "color" color))
         :on-click #(add-bgcolor-fn color)}
        [:div.heading-bg {:style {:background-color (str "var(--color-" color "-500)")}}]])
-    [:a.shadow-sm
+    [:a
      {:title (t :remove-background)
       :on-click rm-bgcolor-fn}
      [:div.heading-bg.remove "-"]]]])
@@ -234,15 +234,15 @@
           (if (keyword? status)
             (case status
               :success
-              (icon "circle-check" {:class "text-success" :size "32"})
+              (icon "circle-check" {:class "text-success" :size "20"})
 
               :warning
-              (icon "alert-circle" {:class "text-warning" :size "32"})
+              (icon "alert-circle" {:class "text-warning" :size "20"})
 
               :error
-              (icon "circle-x" {:class "text-error" :size "32"})
+              (icon "circle-x" {:class "text-error" :size "20"})
 
-              (icon "info-circle" {:class "text-indigo-500" :size "32"}))
+              (icon "info-circle" {:class "text-indigo-500" :size "20"}))
             status)]
       [:div.ui__notifications-content
        {:style