diff --git a/backend/extern/afv-native b/backend/extern/afv-native
index 9d9ae93..21379e0 160000
--- a/backend/extern/afv-native
+++ b/backend/extern/afv-native
@@ -1 +1 @@
-Subproject commit 9d9ae93d3e5e3bfa8a3b04d5082701b07aa45c36
+Subproject commit 21379e02a0ff54a902673d83064172acb8230393
diff --git a/src/main/index.ts b/src/main/index.ts
index b1798a0..6626d6c 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -265,10 +265,10 @@ app.on('quit', async () => {
   await TrackAudioAfv.Exit();
 });
 
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and import them here.
 ipcMain.on('set-always-on-top', (_, state: boolean) => {
-  mainWindow.setAlwaysOnTop(state);
+  // Issue 90: Attempt to make always on top actually work all the time on Windows. There's
+  // an old Electron bug about needing to add "normal": https://github.com/electron/electron/issues/20933.
+  mainWindow.setAlwaysOnTop(state, 'normal');
   currentConfiguration.alwaysOnTop = state;
   saveConfig();
 });