diff --git a/roles/kde/default.nix b/roles/kde/default.nix
index fbcf748..ffcbb8f 100755
--- a/roles/kde/default.nix
+++ b/roles/kde/default.nix
@@ -3,5 +3,6 @@
 {
 	imports = [
 		./plasma.nix
+		./sddm.nix
 	];
 }
diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index d2e7ab0..48d7098 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -20,7 +20,6 @@ in
 
 {
 	# Enable the Plasma 5 Desktop Environment.
-	services.xserver.displayManager.sddm.enable = true;
 	services.xserver.desktopManager.plasma5.enable = true;
 
 	# GTK apps need dconf to grab the correct theme on Wayland
diff --git a/roles/kde/sddm.nix b/roles/kde/sddm.nix
new file mode 100644
index 0000000..a2d34d3
--- /dev/null
+++ b/roles/kde/sddm.nix
@@ -0,0 +1,15 @@
+{ config, ... }:
+
+{
+	# Enable SDDM.
+	services.xserver.displayManager.sddm.enable = true;
+
+	/*
+	Sddm has a very annoying bug where it sometimes hangs at shutdown
+	if you use Plasma's wayland session. The bug is already fixed upstream,
+	but until it sddm gets updated on the repos this will do
+	*/
+	systemd.services.display-manager.serviceConfig = {
+		TimeoutStopSec = "5s";
+	};
+}