diff --git a/config.def.h b/config.def.h
index 1fb5a41..0f38388 100644
--- a/config.def.h
+++ b/config.def.h
@@ -17,6 +17,7 @@ static const char *colors[SchemeLast][2] = {
 	[SchemeSel] = { "#eeeeee", "#005577" },
 	[SchemeOut] = { "#000000", "#00ffff" },
 	[SchemeCaret] = { "#fe5e5e", "#222222" },
+	[SchemeBorder] = { "#cccccc", "#ffffff" },
 };
 
 /* -l and -g options; controls number of lines and columns in grid if > 0 */
@@ -28,6 +29,7 @@ static const unsigned int alphas[SchemeLast][2] = {
 	[SchemeSel] = { OPAQUE, alpha },
 	[SchemeOut] = { OPAQUE, alpha },
     [SchemeCaret] = { OPAQUE, OPAQUE },
+    [SchemeBorder] = { OPAQUE, 0xf2 },
 };
 
 /*
@@ -35,3 +37,7 @@ static const unsigned int alphas[SchemeLast][2] = {
  * for example: " /?\"&[]"
  */
 static const char worddelimiters[] = " ";
+
+/* Size of the window border */
+static unsigned int border_width = 3;
+
diff --git a/dmenu.c b/dmenu.c
index 8b19995..216e6a1 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -29,7 +29,7 @@
 #define OPAQUE                0xffu
 
 /* enums */
-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeCaret, SchemeLast }; /* color schemes */
+enum { SchemeNorm, SchemeSel, SchemeOut, SchemeCaret, SchemeBorder, SchemeLast }; /* color schemes */
 
 struct item {
 	char *text;
@@ -771,12 +771,14 @@ setup(void)
 	/* create menu window */
 	swa.override_redirect = True;
 	swa.background_pixel = 0;
-	swa.border_pixel = 0;
+	swa.border_pixel = scheme[SchemeBorder][ColFg].pixel;
 	swa.colormap = cmap;
 	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
 	                    depth, CopyFromParent, visual,
 	                    CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &swa);
+	if (border_width)
+		XSetWindowBorder(dpy, win, scheme[SchemeBorder][ColFg].pixel);
 	XSetClassHint(dpy, win, &ch);
 
 	/* input methods */
@@ -853,6 +855,8 @@ main(int argc, char *argv[])
 			colors[SchemeSel][ColFg] = argv[++i];
 		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
 			embed = argv[++i];
+		else if (!strcmp(argv[i], "-bw"))
+			border_width = atoi(argv[++i]); /* border width */
 		else
 			usage();
 
@@ -927,3 +931,4 @@ xinitvisual()
 		cmap = DefaultColormap(dpy, screen);
 	}
 }
+