diff --git a/debian/changelog b/debian/changelog
index c9828c05..22f03686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 byobu (4.26) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/bin/byobu:
+    - test that there is something in the windows files
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 04 Aug 2011 17:57:12 -0500
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index abe26ae2..c48ab304 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -47,9 +47,9 @@ byobu-janitor --force
 
 # Allow override of default window list, with BYOBU_WINDOWS environment variable
 CUSTOM_WINDOW_SET=0
-if [ -r "$BYOBU_WINDOWS" ]; then
+if [ -s "$BYOBU_WINDOWS" ]; then
 	CUSTOM_WINDOW_SET=1
-elif [ -r "$BYOBU_CONFIG_DIR/windows.$BYOBU_WINDOWS" ]; then
+elif [ -s "$BYOBU_CONFIG_DIR/windows.$BYOBU_WINDOWS" ]; then
 	CUSTOM_WINDOW_SET=1
 	BYOBU_WINDOWS="$BYOBU_CONFIG_DIR/windows.$BYOBU_WINDOWS"
 elif [ "$#" = "0" ]; then