diff --git a/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx b/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
index 20cc5c3b0..3c35fabcb 100644
--- a/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
+++ b/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
@@ -225,6 +225,7 @@ const ClanSceneController = (props: RouteSectionProps) => {
     }
     toast.success("Created");
     setShowService(false);
+    setWorldMode("select");
   };
 
   createEffect(
@@ -277,7 +278,7 @@ const ClanSceneController = (props: RouteSectionProps) => {
               handleSubmit={handleSubmitService}
               onClose={() => {
                 setShowService(false);
-                setWorldMode("default");
+                setWorldMode("select");
                 currentPromise()?.resolve({ id: "0" });
               }}
             />
diff --git a/pkgs/clan-app/ui/src/scene/cubes.tsx b/pkgs/clan-app/ui/src/scene/cubes.tsx
index 15b130c73..8004c4a65 100644
--- a/pkgs/clan-app/ui/src/scene/cubes.tsx
+++ b/pkgs/clan-app/ui/src/scene/cubes.tsx
@@ -65,7 +65,7 @@ export function useMachineClick() {
 /*Gloabl signal*/
 const [worldMode, setWorldMode] = createSignal<
   "default" | "select" | "service" | "create"
->("default");
+>("select");
 export { worldMode, setWorldMode };
 
 export function CubeScene(props: {
@@ -612,9 +612,7 @@ export function CubeScene(props: {
             description="Select machine"
             name="Select"
             icon="Cursor"
-            onClick={() =>
-              setWorldMode((v) => (v === "select" ? "default" : "select"))
-            }
+            onClick={() => setWorldMode("select")}
             selected={worldMode() === "select"}
           />
           <ToolbarButton
@@ -631,7 +629,7 @@ export function CubeScene(props: {
             icon="Services"
             selected={worldMode() === "service"}
             onClick={() => {
-              setWorldMode((v) => (v === "service" ? "default" : "service"));
+              setWorldMode("service");
             }}
           />
           <ToolbarButton