diff --git a/hm/desktop/frobar/module.nix b/hm/desktop/frobar/module.nix
index 31aecd5..e078832 100644
--- a/hm/desktop/frobar/module.nix
+++ b/hm/desktop/frobar/module.nix
@@ -7,9 +7,6 @@
 {
   config = lib.mkIf config.frogeye.desktop.xorg {
     wayland.windowManager.sway.config.bars = [ ];
-    programs.autorandr.hooks.postswitch = {
-      frobar = "${pkgs.systemd}/bin/systemctl --user restart frobar";
-    };
     systemd.user.services.frobar = {
       Unit = {
         Description = "frobar";
diff --git a/hm/desktop/sway/default.nix b/hm/desktop/sway/default.nix
index 81d73a3..84e5e27 100644
--- a/hm/desktop/sway/default.nix
+++ b/hm/desktop/sway/default.nix
@@ -214,7 +214,7 @@ in
             ) modes
           );
           window = {
-            hideEdgeBorders = "both";
+            hideEdgeBorders = "--i3 both";
             titlebar = false; # So that single-container screens are basically almost fullscreen
             commands = [
               # switch to workspace with urgent window automatically
@@ -234,6 +234,11 @@ in
           };
           seat."*".hide_cursor = "5000";
           startup = [
+            {
+              # https://github.com/emersion/kanshi/issues/43
+              command = "${pkgs.systemd}/bin/systemctl --user restart kanshi";
+              always = true;
+            }
             {
               command = "${
                 pkgs.writeShellApplication {