diff --git a/ui/suite/desktop.html b/ui/suite/desktop.html
index a5bc768..0b57511 100644
--- a/ui/suite/desktop.html
+++ b/ui/suite/desktop.html
@@ -163,14 +163,14 @@
                             <span class="desktop-icon-label">Vibe</span>
                         </div>
 
-                        <div class="desktop-icon" data-app-id="tasks" data-app-title="Tasks" hx-get="/suite/partials/tasks.html" hx-swap="none">
+                        <div class="desktop-icon" data-app-id="tasks" data-app-title="Tasks" hx-get="/suite/tasks/tasks.html" hx-swap="none">
                             <div class="app-icon">
                                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 11l3 3L22 4"/><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/></svg>
                             </div>
                             <span class="desktop-icon-label">Tasks</span>
                         </div>
                         
-                        <div class="desktop-icon" data-app-id="chat" data-app-title="Chat" hx-get="/suite/partials/chat.html" hx-swap="none">
+                        <div class="desktop-icon" data-app-id="chat" data-app-title="Chat" hx-get="/suite/chat/chat.html" hx-swap="none">
                             <div class="app-icon">
                                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/></svg>
                             </div>
diff --git a/ui/suite/partials/chat.html b/ui/suite/partials/chat.html
index 27627f2..dda8245 100644
--- a/ui/suite/partials/chat.html
+++ b/ui/suite/partials/chat.html
@@ -67,7 +67,7 @@
 
         var WS_BASE_URL =
             window.location.protocol === "https:" ? "wss://" : "ws://";
-        var WS_URL = WS_BASE_URL + window.location.host + "/ws/chat";
+        var WS_URL = WS_BASE_URL + window.location.host + "/ws";
 
         var MessageType = {
             EXTERNAL: 0,