diff --git a/Common/Theme.qml b/Common/Theme.qml
index 5cfb9c2a..233753cd 100644
--- a/Common/Theme.qml
+++ b/Common/Theme.qml
@@ -816,6 +816,21 @@ Singleton {
 
     function withAlpha(c, a) { return Qt.rgba(c.r, c.g, c.b, a); }
 
+    function getFillMode(modeName) {
+        switch(modeName) {
+            case "Stretch": return Image.Stretch
+            case "Fit":
+            case "PreserveAspectFit": return Image.PreserveAspectFit
+            case "Fill":
+            case "PreserveAspectCrop": return Image.PreserveAspectCrop
+            case "Tile": return Image.Tile
+            case "TileVertically": return Image.TileVertically
+            case "TileHorizontally": return Image.TileHorizontally
+            case "Pad": return Image.Pad
+            default: return Image.PreserveAspectCrop
+        }
+    }
+
     function snap(value, dpr) {
         const s = dpr || 1
         return Math.round(value * s) / s
diff --git a/Modules/Greetd/GreeterContent.qml b/Modules/Greetd/GreeterContent.qml
index 9d093055..0ace65fd 100644
--- a/Modules/Greetd/GreeterContent.qml
+++ b/Modules/Greetd/GreeterContent.qml
@@ -173,7 +173,7 @@ Item {
             }
             return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : ""
         }
-        fillMode: Image.PreserveAspectCrop
+        fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
         smooth: true
         asynchronous: false
         cache: true
diff --git a/Modules/Lock/LockScreenContent.qml b/Modules/Lock/LockScreenContent.qml
index 06d8f79e..137e7191 100644
--- a/Modules/Lock/LockScreenContent.qml
+++ b/Modules/Lock/LockScreenContent.qml
@@ -139,7 +139,7 @@ Item {
             }
             return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : ""
         }
-        fillMode: Image.PreserveAspectCrop
+        fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
         smooth: true
         asynchronous: false
         cache: true