diff --git a/internal/gutil/gutil.go b/internal/gutil/gutil.go
index fe05c55..2134669 100644
--- a/internal/gutil/gutil.go
+++ b/internal/gutil/gutil.go
@@ -71,8 +71,8 @@ func FillFromUI[T any](into *T, xml ...string) {
 // ErrHasCode returns true if and only if err is a [gerror.GError] and
 // its error code is code.
 func ErrHasCode(err error, code int) bool {
-	var gerr *gerror.GError
-	if !errors.As(err, &gerr) {
+	gerr, ok := errors.AsType[*gerror.GError](err)
+	if !ok {
 		return false
 	}
 	return gerr.ErrorCode() == code
diff --git a/internal/ui/menu.ui b/internal/ui/menu.ui
index 2055f0d..a606b12 100644
--- a/internal/ui/menu.ui
+++ b/internal/ui/menu.ui
@@ -21,7 +21,7 @@
       </item>
       <item>
         <attribute name="action">app.admin_dashboard</attribute>
-        <attribute name="label">_Admin Dashboard</attribute>
+        <attribute name="label">Admin _Dashboard</attribute>
       </item>
     </section>
     <section>
diff --git a/internal/ui/settings.go b/internal/ui/settings.go
index d1bbf20..14d0360 100644
--- a/internal/ui/settings.go
+++ b/internal/ui/settings.go
@@ -29,13 +29,11 @@ func (a *App) initSettings(ctx context.Context) {
 	a.settings.ConnectChanged(func(key string) {
 		switch key {
 		case "tray-icon":
-			if a.settings.Boolean("tray-icon") {
-				glib.IdleAdd(func() {
-					a.initTray(ctx)
-				})
-				return
-			}
 			glib.IdleAdd(func() {
+				if a.settings.Boolean("tray-icon") {
+					a.initTray(ctx)
+					return
+				}
 				a.tray.Close()
 				a.tray = nil
 			})
diff --git a/internal/ui/trayscale.cmb b/internal/ui/trayscale.cmb
index 8bca984..6a2ad15 100644
--- a/internal/ui/trayscale.cmb
+++ b/internal/ui/trayscale.cmb
@@ -7,6 +7,6 @@
   <ui filename="preferences.ui" sha256="323784c79e864af66a5a2ed4b174d1bb44a9693e61f60c37195162de8389eaf4"/>
   <ui filename="selfpage.ui" sha256="a69d5b87a32918950fd7990043d1d34e8532a1d8af100ee3c35d928d9e9d9217"/>
   <ui filename="mullvadpage.ui" sha256="f92befae6868e0766e20740e96b77e31e991e17f6329e85d1ef675921d7e4ef6"/>
-  <ui filename="menu.ui" sha256="702eec3929b9165ac4323806cb3ba57f8234aa9aa21b224703434f068c8f44ac"/>
+  <ui filename="menu.ui" sha256="ff71b7d5104ec13118db6c411687bc54923c3bc95f6deb29db04f1e8771d1bee"/>
   <ui filename="offlinepage.ui" sha256="0a11ddc0b2c6b5408e6f855fd21ff6ccb8905e2ea029c83875f32764714f23d5"/>
 </cambalache-project>