diff --git a/src/main/frontend/components/page.cljs b/src/main/frontend/components/page.cljs
index efa9189b85..11357cb709 100644
--- a/src/main/frontend/components/page.cljs
+++ b/src/main/frontend/components/page.cljs
@@ -377,7 +377,8 @@
 
      (when (and class-or-property?
                 (not (property-handler/block-has-viewable-properties? page))
-                (not config/publishing?))
+                (not config/publishing?)
+                (empty? (:properties (:block/schema page))))
        [:a.fade-link.flex.flex-row.items-center.gap-1.text-sm
         {:on-click #(swap! *show-page-properties? not)}
         (ui/icon (if @*show-page-properties?
diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs
index 8c8c9b504d..c7b8235ac7 100644
--- a/src/main/frontend/components/property.cljs
+++ b/src/main/frontend/components/property.cljs
@@ -371,7 +371,7 @@
                          :close-modal? false
                          :show-new-when-not-exact-match? true
                          :exact-match-exclude-items exclude-properties
-                         :input-default-placeholder "Add a property"
+                         :input-default-placeholder "Add property"
                          :on-chosen (fn [{:keys [value]}]
                                       (reset! *property-key value)
                                       (add-property-from-dropdown entity value (assoc opts :*show-new-property-config? *show-new-property-config?)))