diff --git a/src/main/frontend/components/page.cljs b/src/main/frontend/components/page.cljs
index 5b5251cd0d..380bfc7205 100644
--- a/src/main/frontend/components/page.cljs
+++ b/src/main/frontend/components/page.cljs
@@ -363,7 +363,6 @@
                   :else title))]]]
        (when (and @*hover?
                   db-based?
-                  (not built-in-property?)
                   (not @*edit?))
          [:div.absolute.bottom-2.left-0
           [:div.flex.flex-row.items-center.flex-wrap.ml-2
@@ -609,7 +608,7 @@
                   (plugins/hook-ui-slot :page-head-actions-slotted nil)
                   (plugins/hook-ui-items :pagebar)]))])
 
-          (when (and db-based? (not built-in-property?) @*configure-show?)
+          (when (and db-based? @*configure-show?)
             (if (and (= "property" (:block/type page)) (not config/publishing?))
               (do
                 (state/set-modal! #(property/property-config repo page {}))
diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs
index 3562421c74..74f2dd195f 100644
--- a/src/main/frontend/components/property.cljs
+++ b/src/main/frontend/components/property.cljs
@@ -128,8 +128,9 @@
 
       [:div.grid.grid-cols-4.gap-1.leading-8
        [:label.col-span-1 "Schema type:"]
-       (let [schema-types (->> property-handler/user-face-builtin-schema-types
-                               (remove property-handler/internal-builtin-schema-types)
+       (let [schema-types (->> (concat property-handler/user-face-builtin-schema-types
+                                       (when built-in-property?
+                                         property-handler/internal-builtin-schema-types))
                                (map (comp string/capitalize name))
                                (map (fn [type]
                                       {:label (if (= type "Default") "Text" type)