diff --git a/common/src/app/common/spec/radius.cljc b/common/src/app/common/spec/radius.cljc
index 87472899c..bbc077dea 100644
--- a/common/src/app/common/spec/radius.cljc
+++ b/common/src/app/common/spec/radius.cljc
@@ -33,7 +33,7 @@
 
 (defn has-radius?
   [shape]
-  ((get editable-attrs (:type shape)) :rx))
+  (contains? (get editable-attrs (:type shape)) :rx))
 
 (defn radius-mode
   [shape]
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 a7a913a8b..02900c8ed 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
@@ -180,7 +180,7 @@
               :shape    (let [;; Get the editable attrs from the shape, ensuring that all attributes
                               ;; are present, with value nil if they are not present in the shape.
                               shape-values (merge
-                                             (into {} (map #(hash-map % nil) editable-attrs))
+                                             (into {} (map #(vector % nil)) editable-attrs)
                                              (select-keys shape editable-attrs))]
                           [(conj ids id)
                            (merge-attrs values shape-values)])