diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs
index 3104aa83..e10e213a 100644
--- a/cosmic-applet-workspaces/src/components/app.rs
+++ b/cosmic-applet-workspaces/src/components/app.rs
@@ -23,14 +23,16 @@ use crate::wayland::{WorkspaceEvent, WorkspaceList};
 use crate::wayland_subscription::{workspaces, WorkspacesUpdate};
 
 pub fn run() -> cosmic::iced::Result {
-    let mut settings = Settings::default();
-    settings.initial_surface = InitialSurface::XdgWindow(SctkWindowSettings {
-        iced_settings: cosmic::iced_native::window::Settings {
-            size: (32, 32),
+    let settings = Settings {
+        initial_surface: InitialSurface::XdgWindow(SctkWindowSettings {
+            iced_settings: cosmic::iced_native::window::Settings {
+                size: (32, 32),
+                ..Default::default()
+            },
             ..Default::default()
-        },
+        }),
         ..Default::default()
-    });
+    };
     IcedWorkspacesApplet::run(settings)
 }
 
diff --git a/cosmic-applet-workspaces/src/wayland.rs b/cosmic-applet-workspaces/src/wayland.rs
index f884e8e2..feaaaa75 100644
--- a/cosmic-applet-workspaces/src/wayland.rs
+++ b/cosmic-applet-workspaces/src/wayland.rs
@@ -117,12 +117,10 @@ pub fn spawn_workspaces(tx: mpsc::Sender<WorkspaceList>) -> SyncSender<Workspace
                                 } else {
                                     w_i.wrapping_add(1)
                                 }
+                            } else if w_i == 0 {
+                                max_w
                             } else {
-                                if w_i == 0 {
-                                    max_w
-                                } else {
-                                    w_i.wrapping_sub(1)
-                                }
+                                w_i.wrapping_sub(1)
                             };
                             if let Some(w) = w_g.workspaces.get(d_i) {
                                 w.handle.activate();