diff --git a/Bar/Modules/Workspace.qml b/Bar/Modules/Workspace.qml
index 7d2f7887..8140d431 100644
--- a/Bar/Modules/Workspace.qml
+++ b/Bar/Modules/Workspace.qml
@@ -188,7 +188,7 @@ Item {
                         anchors.fill: parent
                         cursorShape: Qt.PointingHandCursor
                         onClicked: {
-                            WorkspaceManager.switchToWorkspace(model.id);
+                            WorkspaceManager.switchToWorkspace(model.idx);
                         }
                         z: 20
                         hoverEnabled: true
diff --git a/Settings/Settings.qml b/Settings/Settings.qml
index af52ca39..fb471d66 100644
--- a/Settings/Settings.qml
+++ b/Settings/Settings.qml
@@ -28,7 +28,9 @@ Singleton {
             reload()
         }
         onLoaded: function() {
-            WallpaperManager.setCurrentWallpaper(settings.currentWallpaper, true);
+            Qt.callLater(function () {
+                WallpaperManager.setCurrentWallpaper(settings.currentWallpaper, true);
+            })
         }
         onLoadFailed: function(error) {
             settingAdapter = {}