diff --git a/Makefile b/Makefile
index bc9c262..04f3fb5 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ sh:
 	cp -f sh/tmenu_run $(DESTDIR)$(PREFIX)/bin
 	cp -f sh/ss $(DESTDIR)$(PREFIX)/bin
 	cp -f sh/net $(DESTDIR)$(PREFIX)/bin
+	cp -f sh/bspwm-toggle-gaps $(DESTDIR)$(PREFIX)/bin
 
 check:
 	shellcheck sh/*
diff --git a/sh/bspwm-toggle-gaps b/sh/bspwm-toggle-gaps
new file mode 100755
index 0000000..776fc5a
--- /dev/null
+++ b/sh/bspwm-toggle-gaps
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+gaps="$(bspc config top_padding)"
+
+if [ "$gaps" -eq 20 ]; then
+	bspc config window_gap 0
+	bspc config top_padding 18
+else
+	bspc config window_gap 3
+	bspc config top_padding 20
+fi
diff --git a/sh/status b/sh/status
index 243beef..aeaa3cb 100755
--- a/sh/status
+++ b/sh/status
@@ -2,6 +2,7 @@
 
 power_prefix="/sys/class/power_supply/"
 [ -d "${power_prefix}sbs-20-000b" ] && bat="sbs-20-000b"
+[ -d "${power_prefix}BAT0" ] && bat="BAT0"
 
 [ "$(ps aux | grep pulseaudio | wc -l)" -eq 2 ] && ss="pulse" || ss="alsa"
 
@@ -25,6 +26,7 @@ mod_bspwm () {
 }
 
 mod_power () {
+	[ -z "$bat" ] ||
 	tr -d '\n' < /sys/class/power_supply/$bat/capacity
 }