diff --git a/bun.lock b/bun.lock
index c1232275..09481b74 100644
--- a/bun.lock
+++ b/bun.lock
@@ -28,7 +28,7 @@
         "@wasm-fmt/clang-format": "^22.1.8",
         "autoprefixer": "^10.5.4",
         "cmake-js": "^8.0.0",
-        "electron": "^43.3.0",
+        "electron": "^43.4.0",
         "electron-builder": "^26.15.3",
         "electron-conf": "^1.3.0",
         "electron-updater": "^6.8.9",
@@ -636,7 +636,7 @@
 
     "ejs": ["ejs@3.1.10", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="],
 
-    "electron": ["electron@43.3.0", "", { "dependencies": { "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", "install-electron": "install.js" } }, "sha512-nLlvu0WFjftWsSaTkV2B/c4NDuJBspTyXu8vKSQ6vLvFt8uG3NgN49LLKcXddwX0GqVvAQDhciWp+4xOdTdhew=="],
+    "electron": ["electron@43.4.0", "", { "dependencies": { "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", "install-electron": "install.js" } }, "sha512-3qxGF0CeQbiox5oWV1JlbWGQ1VerbmDhTFqW4sJ8h7uqTHniFYPObXJcDna0DMh32et0fFyKzz0YY8lJv3t5jg=="],
 
     "electron-builder": ["electron-builder@26.15.3", "", { "dependencies": { "app-builder-lib": "26.15.3", "builder-util": "26.15.3", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "ci-info": "^4.2.0", "dmg-builder": "26.15.3", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "simple-update-notifier": "2.0.0", "yargs": "^17.6.2" }, "bin": { "electron-builder": "./cli.js", "install-app-deps": "./install-app-deps.js" } }, "sha512-a1KM5heqS3gQCZzizXEI8RjJy3QVogULPdeSknt76uLDpBIW/HDGsMg/XgP0riP6PI9COsRvFITKKGDqA8fJxA=="],
 
@@ -646,7 +646,7 @@
 
     "electron-publish": ["electron-publish@26.15.3", "", { "dependencies": { "@types/fs-extra": "^9.0.11", "aws4": "^1.13.2", "builder-util": "26.15.3", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "form-data": "^4.0.5", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "mime": "^2.5.2" } }, "sha512-g/2bn8YTavY4cuS5F+jOS7zmZbXXBV8KZ8yHKfJjFPoKtzBqrpCdNPxBd3tqdBwP7BVd0lGzf7Bk2s0KesWZ4Q=="],
 
-    "electron-to-chromium": ["electron-to-chromium@1.5.404", "", {}, "sha512-3WJtd7/lVq2Jnuz6wed1l9+1ZD2u2Tet1/1NBc4Iedkmgbu+I7YuAqdAQ8T+VZtnwysMsAf3IqSq9D1gyZjA2g=="],
+    "electron-to-chromium": ["electron-to-chromium@1.5.405", "", {}, "sha512-bNglH7lPH5l+yHOes7Zr4VqxhOy4BQ9ZBUX4VdoFgxMpzJk7W1ZoO3Vgd9Pxa9PyjQ76sfm2aKH/nzEcCNRlew=="],
 
     "electron-updater": ["electron-updater@6.8.9", "", { "dependencies": { "builder-util-runtime": "9.7.0", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", "semver": "~7.7.3", "tiny-typed-emitter": "^2.1.0" } }, "sha512-ZhVxM9iGONUpZGI1FxdMRgJjUFXi7AYGVa5PwKlO1tV1/4zDxQmfKpXOHVztKrd6L9rLcFjERvi1Mf2vxyTkig=="],
 
@@ -1248,7 +1248,7 @@
 
     "@tailwindcss/oxide-wasm32-wasi/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.2.3", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g=="],
 
-    "@tailwindcss/oxide-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.2.2", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.3", "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.3" }, "bundled": true }, "sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw=="],
+    "@tailwindcss/oxide-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.2.3", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4", "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4" }, "bundled": true }, "sha512-UMduMbqO5s5zF2NkNacMT/yK5Y5QiKvWr2+50bzIIxFDwVJ2h49b+oyjaCGPhJxd2/gC2x39EHv/gHVuu36x2Q=="],
 
     "@tailwindcss/oxide-wasm32-wasi/@tybys/wasm-util": ["@tybys/wasm-util@0.10.3", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg=="],
 
diff --git a/package.json b/package.json
index 9a07711a..3bd836ac 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "url": "git+https://github.com/opencor/webapp.git"
   },
   "type": "module",
-  "version": "1.20260811.0",
+  "version": "1.20260813.0",
   "engines": {
     "bun": ">=1.2.0"
   },
@@ -79,7 +79,7 @@
     "@wasm-fmt/clang-format": "^22.1.8",
     "autoprefixer": "^10.5.4",
     "cmake-js": "^8.0.0",
-    "electron": "^43.3.0",
+    "electron": "^43.4.0",
     "electron-builder": "^26.15.3",
     "electron-conf": "^1.3.0",
     "electron-updater": "^6.8.9",
diff --git a/src/renderer/package.json b/src/renderer/package.json
index b7262e5a..9b9a2742 100644
--- a/src/renderer/package.json
+++ b/src/renderer/package.json
@@ -42,7 +42,7 @@
     },
     "./style.css": "./dist/opencor.css"
   },
-  "version": "1.20260811.0",
+  "version": "1.20260813.0",
   "libopencorVersion": "1.20260803.0",
   "scripts": {
     "build": "vite build && bun scripts/generate.version.ts",
diff --git a/src/renderer/src/common/viewRegistry.ts b/src/renderer/src/common/viewRegistry.ts
index 530d5745..482d1935 100644
--- a/src/renderer/src/common/viewRegistry.ts
+++ b/src/renderer/src/common/viewRegistry.ts
@@ -66,7 +66,7 @@ export const useViewRegistry = vueusecore.createGlobalState(() => {
   // Note: the user's chosen view is always returned, whether or not it is applicable to the file (in which case it is
   //       up to the caller to indicate that the view is not supported for the given file type).
 
-  function resolve(activeViewId: string | undefined): IViewDescriptor | null {
+  function resolve(activeViewId: string): IViewDescriptor | null {
     return (
       _descriptors.find((descriptor) => {
         return descriptor.id === activeViewId;
diff --git a/src/renderer/src/components/ViewSwitcherComponent.vue b/src/renderer/src/components/ViewSwitcherComponent.vue
index 6573f51a..c6971381 100644
--- a/src/renderer/src/components/ViewSwitcherComponent.vue
+++ b/src/renderer/src/components/ViewSwitcherComponent.vue
@@ -1,6 +1,7 @@
 <template>
   <nav class="w-14 h-full shrink-0 flex flex-col overflow-y-auto py-1"
     :style="{ borderRight: '1px solid var(--p-content-border-color)' }"
+    @wheel.prevent="onWheel"
   >
     <template v-for="([category, views], categoryIndex) in categoriesWithViews" :key="category.id">
       <div v-if="categoryIndex > 0" class="mx-2 my-1 border-t"
@@ -8,6 +9,7 @@
       />
       <button v-for="view in views" :key="view.id"
         type="button"
+        :ref="(element) => setViewButtonRef(view.id, element)"
         :class="[
           'view-icon flex items-center justify-center mx-1 my-0.5 rounded-r-md transition-colors duration-150',
           { 'view-icon-active': view.id === activeViewId }
@@ -32,16 +34,18 @@ import {
   type ViewCategory as ViewCategoryType
 } from '../common/viewRegistry';
 
-defineProps<{
-  activeViewId?: string;
+const props = defineProps<{
+  activeViewId: string;
 }>();
 
-defineEmits<{
+const emit = defineEmits<{
   selectView: [viewId: string];
 }>();
 
 const viewRegistry = useViewRegistry();
 
+// Compute the list of view categories that have at least one view, along with their corresponding views.
+
 const categoriesWithViews = vue.computed<Array<[ViewCategoryType, IViewDescriptor[]]>>(() => {
   const res: Array<[ViewCategoryType, IViewDescriptor[]]> = [];
 
@@ -55,6 +59,87 @@ const categoriesWithViews = vue.computed<Array<[ViewCategoryType, IViewDescripto
 
   return res;
 });
+
+// Compute the list of view IDs in the order they are displayed in the view switcher.
+
+const viewIds = vue.computed<string[]>(() => {
+  const res: string[] = [];
+
+  for (const [, views] of categoriesWithViews.value) {
+    for (const view of views) {
+      res.push(view.id);
+    }
+  }
+
+  return res;
+});
+
+// Keep a map of view IDs to their corresponding button elements, so we can scroll the active view's button into view
+// when the active view changes.
+
+const viewButtonRefs = new Map<string, HTMLElement>();
+
+const setViewButtonRef = (viewId: string, element: unknown): void => {
+  if (element instanceof HTMLElement) {
+    viewButtonRefs.set(viewId, element);
+  } else {
+    viewButtonRefs.delete(viewId);
+  }
+};
+
+// Switch views with the mouse wheel.
+// Note: we don't wrap around, i.e. we don't go from the last view to the first view, or vice versa. Also, we damp the
+//       wheel delta to avoid switching views too quickly when the user scrolls fast.
+
+const wheelDelta = vue.ref(0);
+const wheelThreshold = 321;
+
+const selectViewByOffset = (offset: number): void => {
+  const activeViewIndex = viewIds.value.indexOf(props.activeViewId);
+
+  if (activeViewIndex === -1) {
+    return;
+  }
+
+  const newViewIndex = Math.min(Math.max(activeViewIndex + offset, 0), viewIds.value.length - 1);
+
+  if (newViewIndex !== activeViewIndex) {
+    emit('selectView', viewIds.value[newViewIndex]);
+  }
+};
+
+const onWheel = (event: WheelEvent): void => {
+  if (!viewIds.value.length) {
+    return;
+  }
+
+  wheelDelta.value += event.deltaY;
+
+  while (wheelDelta.value >= wheelThreshold) {
+    wheelDelta.value -= wheelThreshold;
+
+    selectViewByOffset(1);
+  }
+
+  while (wheelDelta.value <= -wheelThreshold) {
+    wheelDelta.value += wheelThreshold;
+
+    selectViewByOffset(-1);
+  }
+};
+
+// Scroll the active view's button into view when the active view changes.
+
+vue.watch(
+  () => props.activeViewId,
+  (viewId) => {
+    viewButtonRefs.get(viewId)?.scrollIntoView({
+      block: 'nearest',
+      inline: 'nearest'
+    });
+  },
+  { immediate: true, flush: 'post' }
+);
 </script>
 
 <style scoped>