diff --git a/CHANGES.md b/CHANGES.md
index 8e26ef176e..e14685e6ac 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,6 +33,7 @@
 - Fix dates to avoid show them in english when browser is in auto [Taiga #13786](https://tree.taiga.io/project/penpot/issue/13786)
 - Fix focus radio button [Taiga #13841](https://tree.taiga.io/project/penpot/issue/13841)
 - Token tree should be expanded by default [Taiga #13631](https://tree.taiga.io/project/penpot/issue/13631)
+- Fix opacity incorrectly disabled for visible shapes [Taiga #13906](https://tree.taiga.io/project/penpot/issue/13906)
 
 ## 2.15.0 (Unreleased)
 
diff --git a/frontend/src/app/main/ui/ds/controls/radio_buttons.cljs b/frontend/src/app/main/ui/ds/controls/radio_buttons.cljs
index 24e4b49453..93837196d0 100644
--- a/frontend/src/app/main/ui/ds/controls/radio_buttons.cljs
+++ b/frontend/src/app/main/ui/ds/controls/radio_buttons.cljs
@@ -24,7 +24,7 @@
     [:and :string [:fn #(contains? icon-list %)]]]
    [:label :string]
    [:value [:or :keyword :string]]
-   [:disabled {:optional true} :boolean]])
+   [:disabled {:optional true} [:maybe :boolean]]])
 
 (def ^:private schema:radio-buttons
   [:map
@@ -35,8 +35,8 @@
    [:name {:optional true} :string]
    [:selected {:optional true}
     [:maybe [:or :keyword :string]]]
-   [:allow-empty {:optional true} :boolean]
-   [:disabled {:optional true} :boolean]
+   [:allow-empty {:optional true} [:maybe :boolean]]
+   [:disabled {:optional true} [:maybe :boolean]]
    [:options [:vector {:min 1} schema:radio-button]]
    [:on-change {:optional true} fn?]])
 
@@ -85,7 +85,8 @@
      (for [[idx {:keys [id class value label icon disabled]}] (d/enumerate options)]
        (let [value-str (d/name value)
              selected-str (when selected (d/name selected))
-             checked? (= selected-str value-str)]
+             checked? (= selected-str value-str)
+             disabled (d/nilv disabled false)]
          [:label {:key idx
                   :html-for id
                   :data-label true
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
index caff7d7454..45f8b994e4 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
@@ -255,6 +255,9 @@
                                   (cond
                                     (= attr-group :measure) (select-measure-keys shape)
                                     :else (select-keys shape editable-attrs)))
+                    shape-values (cond-> shape-values
+                                   (= attr-group :layer)
+                                   (update :hidden #(if (nil? %) false %)))
                     new-token-acc (merge-token-values token-acc editable-attrs applied-tokens)]
                 [(conj ids id)
                  (merge-attrs values shape-values)