diff --git a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
index 1cc79cb..2649c50 100644
--- a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
+++ b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
   import Button, { Label } from "@smui/button";
   import TextField from "@smui/textfield";
   import MessageDialog from "$dialogs/MessageDialog.svelte";
@@ -73,7 +73,10 @@
   <Content id="change-hostname-dialog-content">
     <TextField
       bind:value={hostname}
-      use={[[virtualKeyboardChange, (newValue) => (hostname = newValue)]]}
+      use={[
+        InitialFocus,
+        [virtualKeyboardChange, (newValue) => (hostname = newValue)],
+      ]}
       label="New Hostname"
       spellcheck="false"
       variant="filled"
diff --git a/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte b/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte
index b008e83..1f8b487 100644
--- a/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte
+++ b/src/svelte-components/src/dialogs/ManualHomeAxisDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
   import TextField from "@smui/textfield";
   import Button, { Label } from "@smui/button";
   import { ControllerMethods } from "$lib/RegisterControllerMethods";
@@ -31,7 +31,10 @@
       label="Absolute"
       type="number"
       bind:value
-      use={[[virtualKeyboardChange, (newValue) => (value = newValue)]]}
+      use={[
+        InitialFocus,
+        [virtualKeyboardChange, (newValue) => (value = newValue)],
+      ]}
       variant="filled"
       style="width: 100%;"
     />
diff --git a/src/svelte-components/src/dialogs/MessageDialog.svelte b/src/svelte-components/src/dialogs/MessageDialog.svelte
index 735341c..7230ad8 100644
--- a/src/svelte-components/src/dialogs/MessageDialog.svelte
+++ b/src/svelte-components/src/dialogs/MessageDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
   import Button, { Label } from "@smui/button";
 
   export let open: boolean;
@@ -23,7 +23,7 @@
 
   {#if !noaction}
     <Actions>
-      <Button defaultAction>
+      <Button defaultAction use={[InitialFocus]}>
         <Label>OK</Label>
       </Button>
     </Actions>
diff --git a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
index 7cb7415..f06e922 100644
--- a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
+++ b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
@@ -1,5 +1,5 @@
 <script type="ts">
-  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
   import Button, { Label } from "@smui/button";
   import Radio from "@smui/radio";
   import FormField from "@smui/form-field";
@@ -53,7 +53,7 @@
   </Content>
 
   <Actions>
-    <Button>
+    <Button use={[InitialFocus]}>
       <Label>Cancel</Label>
     </Button>
     <Button
diff --git a/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte b/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
index 32b2091..44ec66d 100644
--- a/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
+++ b/src/svelte-components/src/dialogs/SetAxisPositionDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
   import TextField from "@smui/textfield";
   import Button, { Label } from "@smui/button";
   import { ControllerMethods } from "$lib/RegisterControllerMethods";
@@ -43,7 +43,10 @@
       label="Position"
       type="number"
       bind:value
-      use={[[virtualKeyboardChange, (newValue) => (value = newValue)]]}
+      use={[
+        InitialFocus,
+        [virtualKeyboardChange, (newValue) => (value = newValue)],
+      ]}
       spellcheck="false"
       variant="filled"
       style="width: 100%;"
diff --git a/src/svelte-components/src/dialogs/SetTimeDialog.svelte b/src/svelte-components/src/dialogs/SetTimeDialog.svelte
index 25feebb..ed002e5 100644
--- a/src/svelte-components/src/dialogs/SetTimeDialog.svelte
+++ b/src/svelte-components/src/dialogs/SetTimeDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
   import Button, { Label } from "@smui/button";
   import TextField from "@smui/textfield";
   import CircularProgress from "@smui/circular-progress";
@@ -154,7 +154,10 @@
         <Label>Date & Time</Label>
         <TextField
           bind:value
-          use={[[virtualKeyboardChange, (newValue) => (value = newValue)]]}
+          use={[
+            InitialFocus,
+            [virtualKeyboardChange, (newValue) => (value = newValue)],
+          ]}
           label="Time"
           type="datetime-local"
           variant="filled"
diff --git a/src/svelte-components/src/dialogs/UploadDialog.svelte b/src/svelte-components/src/dialogs/UploadDialog.svelte
index 97c9071..f74eb39 100644
--- a/src/svelte-components/src/dialogs/UploadDialog.svelte
+++ b/src/svelte-components/src/dialogs/UploadDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
   import Button, { Label } from "@smui/button";
   import LinearProgress from "@smui/linear-progress";
 
@@ -71,7 +71,7 @@
   </Content>
 
   <Actions>
-    <Button on:click={onCancel}>
+    <Button on:click={onCancel} use={[InitialFocus]}>
       <Label>Cancel</Label>
     </Button>
   </Actions>
diff --git a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
index 0c167c1..67eee55 100644
--- a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
+++ b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
@@ -58,7 +58,10 @@
     {#if needPassword}
       <TextField
         bind:value={password}
-        use={[[virtualKeyboardChange, (newValue) => (password = newValue)]]}
+        use={[
+          InitialFocus,
+          [virtualKeyboardChange, (newValue) => (password = newValue)],
+        ]}
         label="Password"
         spellcheck="false"
         variant="filled"
@@ -91,7 +94,6 @@
 
     <Button
       defaultAction
-      use={[InitialFocus]}
       on:click={onConfirm}
       disabled={needPassword && (password.length < 8 || password.length > 128)}
     >
diff --git a/src/svelte-components/src/lib/NetworkInfo.ts b/src/svelte-components/src/lib/NetworkInfo.ts
index 8e9b46c..3f8b122 100644
--- a/src/svelte-components/src/lib/NetworkInfo.ts
+++ b/src/svelte-components/src/lib/NetworkInfo.ts
@@ -43,7 +43,13 @@ export function processNetworkInfo(rawNetworkInfo: NetworkInfo) {
         if (network.Name) {
             network.lastSeen = now;
             network.active = rawNetworkInfo.wifi.ssid === network.Name;
-            networksByName[network.Name] = network;
+
+            // There can be many entries for the same ssid, so
+            // we want to take the one with the highest quality
+            const currentNetwork = networksByName[network.Name] ?? { Quality: 0 };
+            if (network.Quality >= currentNetwork.Quality) {
+                networksByName[network.Name] = network;
+            }
         }
     }