diff --git a/deps/db/src/logseq/db.cljs b/deps/db/src/logseq/db.cljs
index a54a77e2b9..ca2826dec2 100644
--- a/deps/db/src/logseq/db.cljs
+++ b/deps/db/src/logseq/db.cljs
@@ -198,6 +198,15 @@
       (d/entity db [:block/uuid id])
       (d/entity db (get-first-page-by-name db (name page-name-or-uuid))))))
 
+(defn get-case-page
+  "Case sensitive version of get-page. For use with DB graphs"
+  [db page-name-or-uuid]
+  (when db
+    (if-let [id (if (uuid? page-name-or-uuid) page-name-or-uuid
+                    (parse-uuid page-name-or-uuid))]
+      (d/entity db [:block/uuid id])
+      (d/entity db (sqlite-common-db/get-first-page-by-original-name db page-name-or-uuid)))))
+
 (defn page-empty?
   "Whether a page is empty. Does it has a non-page block?
   `page-id` could be either a string or a db/id."
diff --git a/deps/db/src/logseq/db/frontend/schema.cljs b/deps/db/src/logseq/db/frontend/schema.cljs
index 2807a544d5..c431cbdd45 100644
--- a/deps/db/src/logseq/db/frontend/schema.cljs
+++ b/deps/db/src/logseq/db/frontend/schema.cljs
@@ -90,7 +90,7 @@
    :block/name {:db/unique :db.unique/identity}
 
    ;; page's original name
-   :block/original-name {}
+   :block/original-name {:db/index true}
 
    ;; page's journal day
    :block/journal-day {}
diff --git a/deps/db/src/logseq/db/sqlite/common_db.cljs b/deps/db/src/logseq/db/sqlite/common_db.cljs
index 758c7e36ee..dbd5335c1f 100644
--- a/deps/db/src/logseq/db/sqlite/common_db.cljs
+++ b/deps/db/src/logseq/db/sqlite/common_db.cljs
@@ -8,16 +8,23 @@
             [logseq.common.util :as common-util]
             [logseq.common.config :as common-config]))
 
-(defn get-pages-by-name
+(defn- get-pages-by-name
   [db page-name]
   (d/datoms db :avet :block/name (common-util/page-name-sanity-lc page-name)))
 
 (defn get-first-page-by-name
-  "Return the oldest page's db id"
+  "Return the oldest page's db id for :block/name"
   [db page-name]
   (when (and db (string? page-name))
     (first (sort (map :e (get-pages-by-name db page-name))))))
 
+(defn get-first-page-by-original-name
+  "Return the oldest page's db id for :block/original-name"
+  [db page-name]
+  {:pre [(string? page-name)]}
+  (first (sort (map :e
+                    (d/datoms db :avet :block/original-name page-name)))))
+
 (comment
   (defn- get-built-in-files
     [db]
diff --git a/src/main/frontend/components/cmdk.cljs b/src/main/frontend/components/cmdk.cljs
index 25824d440b..da2ea828fe 100644
--- a/src/main/frontend/components/cmdk.cljs
+++ b/src/main/frontend/components/cmdk.cljs
@@ -380,7 +380,8 @@
   [state]
   (let [highlighted-item (some-> state state->highlighted-item)]
     (or (:block/uuid (:source-block highlighted-item))
-        (or (:block/uuid (db/get-page (:source-page highlighted-item)))
+        (or (:block/uuid (db/get-case-page (:source-page highlighted-item)))
+            ;; fallback for file graphs
             (:source-page highlighted-item)))))
 
 (defmethod handle-action :open-page [_ state _event]
diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs
index d208b37ac1..b01ea428e9 100644
--- a/src/main/frontend/components/property.cljs
+++ b/src/main/frontend/components/property.cljs
@@ -172,7 +172,7 @@
                  (if (= type :default)
                    (pv/<create-new-block! block property "")
                    (property-handler/set-block-property! repo (:block/uuid block)
-                                                         (:db/ident (db/get-page property-name))
+                                                         (:db/ident (db/get-case-page property-name))
                                                          :logseq.property/empty-placeholder)))))))}
 
         ;; only set when in property configure modal
@@ -483,7 +483,7 @@
     [:div.ls-property-input.flex.flex-1.flex-row.items-center.flex-wrap.gap-1
      (if in-block-container? {:style {:padding-left 22}} {})
      (if @*property-key
-       (let [property (db/get-page @*property-key)]
+       (let [property (db/get-case-page @*property-key)]
          [:div.ls-property-add.grid.grid-cols-5.gap-1.flex.flex-1.flex-row.items-center
           [:div.flex.flex-row.items-center.col-span-2
            [:span.bullet-container.cursor [:span.bullet]]
diff --git a/src/main/frontend/components/property/value.cljs b/src/main/frontend/components/property/value.cljs
index 76b10a71b7..9772d48fce 100644
--- a/src/main/frontend/components/property/value.cljs
+++ b/src/main/frontend/components/property/value.cljs
@@ -81,9 +81,9 @@
           (db-property-handler/class-add-property! repo (:block/uuid block) property-key)
           (let [[property-id property-value']
                 (if (string? property-key)
-                  (if-let [ent (ldb/get-page (db/get-db repo) property-key)]
+                  (if-let [ent (ldb/get-case-page (db/get-db repo) property-key)]
                     [(:db/ident ent) property-value]
-                  ;; This is a new property. Create a new property id to use of set-block-property!
+                    ;; This is a new property. Create a new property id to use of set-block-property!
                     [(db-property-handler/ensure-unique-db-ident
                       (db/get-db (state/get-current-repo))
                       (db-property/create-user-property-ident-from-name property-key))
diff --git a/src/main/frontend/db.cljs b/src/main/frontend/db.cljs
index e38341fc24..84ff638a17 100644
--- a/src/main/frontend/db.cljs
+++ b/src/main/frontend/db.cljs
@@ -34,7 +34,7 @@
   get-custom-css
   get-file-last-modified-at get-file get-file-page get-file-page-id file-exists?
   get-files-blocks get-files-full get-journals-length
-  get-latest-journals get-page get-page-alias get-page-alias-names
+  get-latest-journals get-page get-case-page get-page-alias get-page-alias-names
   get-page-blocks-count get-page-blocks-no-cache get-page-file get-page-format
   get-page-referenced-blocks get-page-referenced-blocks-full get-page-referenced-pages
   get-all-pages get-pages-relation get-pages-that-mentioned-page
diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs
index 5864751050..894ea06e13 100644
--- a/src/main/frontend/db/model.cljs
+++ b/src/main/frontend/db/model.cljs
@@ -498,6 +498,11 @@ independent of format as format specific heading characters are stripped"
   (when page-name-or-uuid
     (ldb/get-page (conn/get-db) page-name-or-uuid)))
 
+(defn get-case-page
+  [page-name-or-uuid]
+  (when page-name-or-uuid
+    (ldb/get-case-page (conn/get-db) page-name-or-uuid)))
+
 (defn get-redirect-page-name
   "Given any readable page-name, return the exact page-name in db. If page
    doesn't exists yet, will return the passed `page-name`. Accepts both
diff --git a/src/main/frontend/handler/db_based/property.cljs b/src/main/frontend/handler/db_based/property.cljs
index 51f1c54b29..8213a3b7f2 100644
--- a/src/main/frontend/handler/db_based/property.cljs
+++ b/src/main/frontend/handler/db_based/property.cljs
@@ -293,7 +293,7 @@
       (let [[db-ident property options]
             ;; strings come from user
             (if (string? property-id)
-              (if-let [ent (ldb/get-page (db/get-db repo) property-id)]
+              (if-let [ent (ldb/get-case-page (db/get-db repo) property-id)]
                 [(:db/ident ent) ent {}]
                 ;; creates ident beforehand b/c needed in later transact and this avoids
                 ;; making this whole fn async for now