diff --git a/tasks/boot.yml b/tasks/boot.yml
index 3103ba4..b276bb6 100644
--- a/tasks/boot.yml
+++ b/tasks/boot.yml
@@ -70,3 +70,15 @@
   loop:
     - amd-ucode
     - intel-ucode
+
+- name: Install nohang
+  aur:
+    skip_installed: true
+    name: "nohang-git"
+  become: true
+  become_user: aur_builder
+
+- name: Enable nohang
+  systemd:
+    name: nohang-desktop
+    enabled: true