diff --git a/debian/changelog b/debian/changelog
index fc742d72..2b2f6050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,12 +18,14 @@ byobu (2.4) unreleased; urgency=low
     the chosen windows; but on refresh, only reload the chosen profile;
     revert previous hack that did this by creating a temporary config
     file and broke on hardy, LP: #375309
+  * screen-launcher: don't use the -x argument if launching a new screen,
+    as this fails to launch default windows, LP: #375768
   * debian/control: suggest vim, for better handling of status details
 
   [ David Duffey ]
   * rpm/byobu.spec: initial specfile for RH packaging
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 14 May 2009 13:03:53 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 14 May 2009 13:22:17 -0500
 
 byobu (2.3-0ubuntu1) karmic; urgency=low
 
diff --git a/screen-launcher b/screen-launcher
index ddf66553..b8ea1c03 100755
--- a/screen-launcher
+++ b/screen-launcher
@@ -25,5 +25,10 @@
 # and friends can pick it up before going into screen
 [ -x /bin/bash ] && /bin/true | /bin/bash -i -s
 
-# Launch screen
-exec screen -xRR
+arg="-xRR"
+out=`screen -ls 2>/dev/null`
+if echo "$out" | grep -qsi "^No Sockets found in "; then
+	# Start new session
+	arg=""
+fi
+exec screen "$arg"