         selected? (contains? selected (:id item))
         collapsed? (:collapsed item true)
         shapes-map (mx/react wb/shapes-by-id-ref)
-        ;; TODO: Fix this temporary hack (Looks like a problem in defcs macro)
-        classes (if (nil? own)
-                 (classnames :selected selected?)
-                 (classnames
-                   :selected selected?
-                   :drag-top (= :top (:over @local))
-                   :drag-bottom (= :bottom (:over @local))
-                   :drag-inside (= :middle (:over @local))))
+        classes (classnames
+                 :selected selected?
+                 :drag-top (= :top (:over @local))
+                 :drag-bottom (= :bottom (:over @local))
+                 :drag-inside (= :middle (:over @local)))
         select #(select-shape selected item %)
         toggle-visibility #(toggle-visibility selected item %)
         toggle-blocking #(toggle-blocking item %)]

        [:div.element-icon (element-icon item)]
        (shape-name item)]])))

;; --- Layer Group (Component)

(mx/defcs layer-group

                :let [key (str (:id shape))]]
            (if (= (:type shape) :group)
              ;; TODO: Fix this temporary hack (Looks like a problem in defcs macro)
              (-> (defcs-macro-hack shape selected)
                  (mx/with-key key))
              (-> (layer-simple shape selected)
                  (mx/with-key key))))])])))
