diff --git a/client/src/units/unit.ts b/client/src/units/unit.ts
index 987c4f29..1d15d27e 100644
--- a/client/src/units/unit.ts
+++ b/client/src/units/unit.ts
@@ -131,7 +131,7 @@ export class Unit extends Marker {
         /* Only alive units can be selected. Some units are not selectable (weapons) */
         if ((this.getData().alive || !selected) && this.#selectable && this.#selected != selected) {
             this.#selected = selected;
-            this.getElement()?.querySelector(".unit")?.setAttribute("data-is-selected", String(this.getSelected()));
+            this.getElement()?.querySelector( `[data-object|="unit"]` )?.toggleAttribute( "data-is-selected" );
             if (selected)
                 document.dispatchEvent(new CustomEvent("unitSelection", { detail: this }));
             else
diff --git a/client/views/uikit.ejs b/client/views/uikit.ejs
index 6614fcb7..d21af865 100644
--- a/client/views/uikit.ejs
+++ b/client/views/uikit.ejs
@@ -1070,10 +1070,9 @@
 
             showSection();
 
-            document.querySelectorAll( ".unit" ).forEach( unit => {
+            document.querySelectorAll( `[data-object|="unit"]` ).forEach( unit => {
                 unit.addEventListener( "click", ev => {
-                    console.log( unit.dataset.isSelected );
-                    unit.dataset.isSelected = ( unit.dataset.isSelected === "true" ) ? null : "true";
+                    unit.toggleAttribute( "data-is-selected" );
                 });
             });