diff --git a/bale/content.py b/bale/content.py
index 22ebdeb..4491992 100644
--- a/bale/content.py
+++ b/bale/content.py
@@ -1,3 +1,4 @@
+import asyncio
 from nicegui import ui
 from bale import elements as el
 import bale.logo as logo
@@ -26,7 +27,7 @@ class Content:
         self._automation = None
         self._history = None
 
-    def build(self):
+    async def build(self):
         self._header = ui.header(bordered=True).classes("bg-dark q-pt-sm q-pb-xs")
         self._header.tailwind.border_color(f"[{el.orange}]").min_width("[920px]")
         self._header.visible = False
@@ -44,11 +45,7 @@ class Content:
         self._tab_panels = (
             ui.tab_panels(self._tabs, value="Manage", on_change=lambda e: self._tab_changed(e), animated=False).classes("w-full h-full").bind_visibility_from(self._header)
         )
-        ui.timer(1, self.select_default, once=True)
-
-    async def select_default(self):
-        tab = Tab(spinner=None)
-        default = tab.common.get("default", "")
+        default = Tab(spinner=None).common.get("default", "")
         if default != "":
             await self.host_selected(default)
 
diff --git a/bale/page.py b/bale/page.py
index d6fc71a..079fc25 100644
--- a/bale/page.py
+++ b/bale/page.py
@@ -1,4 +1,5 @@
-from nicegui import app, ui
+import asyncio
+from nicegui import app, Client, ui
 from bale import elements as el
 from bale.drawer import Drawer
 from bale.content import Content
@@ -10,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 def build():
     @ui.page("/")
-    def page() -> None:
+    async def index(client: Client) -> None:
         app.add_static_files("/static", "static")
         el.load_element_css()
         cli.load_terminal_css()
@@ -28,4 +29,4 @@ def build():
         content = Content()
         drawer = Drawer(column, content.host_selected, content.hide)
         drawer.build()
-        content.build()
+        await content.build()