diff --git a/src/config.h b/src/config.h
index 573e17b..8f4c40c 100644
--- a/src/config.h
+++ b/src/config.h
@@ -3,7 +3,8 @@
 /* appearance */
 static const unsigned int borderpx	= 4;		/* border pixel of windows */
 static const unsigned int snap		= 16;		/* snap pixel (32)*/
-static const unsigned int gappx		= 40;
+static const unsigned int gappx		= 0;
+static const unsigned int gappx2	= 40;
 static const int showbar			= 1;		/* 0 means no bar */
 static const int topbar				= 0;		/* 0 means bottom bar */
 static const int usealtbar			= 1;		/* 1 means use non-dwm status bar */
diff --git a/src/dwm.c b/src/dwm.c
index b536401..55539f4 100644
--- a/src/dwm.c
+++ b/src/dwm.c
@@ -1841,10 +1841,10 @@ setgaps(const Arg *arg)
 void
 togglegaps(const Arg *arg)
 {
-	if (selmon->gappx == 0)
+	if ((selmon->gappx == 0) || (selmon->gappx == gappx2))
 		selmon->gappx = gappx;
 	else
-		selmon->gappx = 0;
+		selmon->gappx = gappx2;
 	arrange(selmon);
 }