diff --git a/Common/Theme.qml b/Common/Theme.qml
index 72cf71f4..b4913fd8 100644
--- a/Common/Theme.qml
+++ b/Common/Theme.qml
@@ -9,6 +9,7 @@ import Quickshell.Io
 import Quickshell.Services.UPower
 import qs.Common
 import qs.Services
+import qs.Modules.Greetd
 import "StockThemes.js" as StockThemes
 
 Singleton {
@@ -425,7 +426,12 @@ Singleton {
         }
     }
 
-    property real cornerRadius: typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12
+    property real cornerRadius: {
+        if (typeof SessionData !== "undefined" && SessionData.isGreeterMode && typeof GreetdSettings !== "undefined") {
+            return GreetdSettings.cornerRadius
+        }
+        return typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12
+    }
     property real spacingXS: 4
     property real spacingS: 8
     property real spacingM: 12
diff --git a/Modules/BlurredWallpaperBackground.qml b/Modules/BlurredWallpaperBackground.qml
index 66b648f2..2625fd63 100644
--- a/Modules/BlurredWallpaperBackground.qml
+++ b/Modules/BlurredWallpaperBackground.qml
@@ -160,7 +160,7 @@ Variants {
                 asynchronous: true
                 smooth: true
                 cache: true
-                fillMode: root.getFillMode(SettingsData.wallpaperFillMode)
+                fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
             }
 
             Image {
@@ -171,7 +171,7 @@ Variants {
                 asynchronous: true
                 smooth: true
                 cache: true
-                fillMode: root.getFillMode(SettingsData.wallpaperFillMode)
+                fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
 
                 onStatusChanged: {
                     if (status !== Image.Ready)
diff --git a/Modules/Greetd/GreetdSettings.qml b/Modules/Greetd/GreetdSettings.qml
index cf34cef1..1efed6eb 100644
--- a/Modules/Greetd/GreetdSettings.qml
+++ b/Modules/Greetd/GreetdSettings.qml
@@ -43,6 +43,7 @@ Singleton {
     property bool lockScreenShowPowerActions: true
     property var screenPreferences: ({})
     property int animationSpeed: 2
+    property string wallpaperFillMode: "Fill"
 
     readonly property string defaultFontFamily: "Inter Variable"
     readonly property string defaultMonoFontFamily: "Fira Code"
@@ -78,6 +79,7 @@ Singleton {
                 lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true
                 screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({})
                 animationSpeed = settings.animationSpeed !== undefined ? settings.animationSpeed : 2
+                wallpaperFillMode = settings.wallpaperFillMode !== undefined ? settings.wallpaperFillMode : "Fill"
                 settingsLoaded = true
 
                 if (typeof Theme !== "undefined") {
diff --git a/Modules/Greetd/GreeterContent.qml b/Modules/Greetd/GreeterContent.qml
index b734b761..39632335 100644
--- a/Modules/Greetd/GreeterContent.qml
+++ b/Modules/Greetd/GreeterContent.qml
@@ -149,7 +149,7 @@ Item {
             var currentWallpaper = SessionData.getMonitorWallpaper(screenName)
             return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : ""
         }
-        fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
+        fillMode: Theme.getFillMode(GreetdSettings.wallpaperFillMode)
         smooth: true
         asynchronous: false
         cache: true