diff --git a/configuration.nix b/configuration.nix
index a119891..ba1a8bb 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -186,6 +186,12 @@
   # Disable powerbutton => for use with eww
   services.logind.extraConfig = ''HandlePowerKey=ignore'';
   services.acpid.enable = true;
+  environment.etc = {
+    "acpi/events/power".text = ''
+      event=button/power.*
+      action=/home/elias/eww/scripts/powermenu.sh
+    '';
+  };
 
   # Set stateVersion. Leave it as set.
   system.stateVersion = "23.11";
diff --git a/home/programs/apci/default.nix b/home/programs/apci/default.nix
deleted file mode 100644
index f672c6a..0000000
--- a/home/programs/apci/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  xdg.configFile."acpi" = {
-    recursive = true;
-    source = ./src;
-  };
-}
diff --git a/home/programs/apci/src/actions/power-button.sh b/home/programs/apci/src/actions/power-button.sh
deleted file mode 100755
index 051cbdc..0000000
--- a/home/programs/apci/src/actions/power-button.sh
+++ /dev/null
@@ -1 +0,0 @@
-eww open power
diff --git a/home/programs/apci/src/events/powerbtn b/home/programs/apci/src/events/powerbtn
deleted file mode 100644
index 754a23f..0000000
--- a/home/programs/apci/src/events/powerbtn
+++ /dev/null
@@ -1,2 +0,0 @@
-event=button/power.*
-action=$HOME/.config/acpi/actions/power-button.sh
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 0cd2fb6..26f7de8 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./alacritty
     ./anki
-    ./apci
     ./calibre
     ./discord
     ./dolphin
diff --git a/home/programs/eww/src/powerpopup.yuck b/home/programs/eww/src/powerpopup.yuck
index f25180f..83c99dd 100644
--- a/home/programs/eww/src/powerpopup.yuck
+++ b/home/programs/eww/src/powerpopup.yuck
@@ -2,28 +2,28 @@
   (box
     :class "powermenu"
     (button
-      :onclick "systemctl poweroff"
+      :onclick "close eww power; systemctl poweroff"
       :class "powermenu-button"
       (label
         :text "⏻ "))
     (label
       :text " ")
     (button
-      :onclick "loginctl lock-session"
+      :onclick "close eww power; loginctl lock-session"
       :class "powermenu-button"
       (label
         :text ""))
     (label
       :text " ")
     (button
-      :onclick "systemctl reboot"
+      :onclick "close eww power; systemctl reboot"
       :class "powermenu-button"
       (label
         :text ""))
     (label
       :text "")
     (button
-      :onclick "loginctl terminate-user $USER"
+      :onclick "close eww power; loginctl terminate-user $USER"
       :class "powermenu-button"
       (label
         :text ""))))
diff --git a/home/programs/eww/src/scripts/powermenu.sh b/home/programs/eww/src/scripts/powermenu.sh
new file mode 100755
index 0000000..903b334
--- /dev/null
+++ b/home/programs/eww/src/scripts/powermenu.sh
@@ -0,0 +1,6 @@
+WINDOW_NAME="power"
+if eww windows | grep -q "$WINDOW_NAME"; then
+  eww close "$WINDOW_NAME"
+else
+  eww open "$WINDOW_NAME"
+fi