diff --git a/claws-mail-fix-hidden-mainwin.patch b/claws-mail-fix-hidden-mainwin.patch
new file mode 100644
index 0000000..2698f16
--- /dev/null
+++ b/claws-mail-fix-hidden-mainwin.patch
@@ -0,0 +1,11 @@
+diff -up claws/src/mainwindow.c.orig claws/src/mainwindow.c
+--- claws/src/mainwindow.c.orig	2011-04-09 11:41:02.000000000 +0200
++++ claws/src/mainwindow.c	2011-04-09 11:43:41.000000000 +0200
+@@ -3573,6 +3573,7 @@ void main_window_popup(MainWindow *mainw
+ 	if (first_start) {
+ #ifdef G_OS_UNIX
+ 		gtk_window_deiconify(GTK_WINDOW(mainwin->window));
++		gtkut_window_popup(mainwin->window);
+ #endif
+ 		first_start = FALSE;
+ 	} else {
diff --git a/claws-mail.spec b/claws-mail.spec
index 9488508..1100a47 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,4 +1,4 @@
-%global cvsdate 20110403
+%global cvsdate 20110409
 
 Name:           claws-mail
 Version:        3.7.9
@@ -8,7 +8,9 @@ Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
 # cvs -z3 -d:pserver:anonymous@claws-mail.org:/ co -r gtk2 claws
+# find claws -type d -name 'CVS' -exec rm -r {} \;
 Source0:        claws-mail-%{cvsdate}cvs.tar.bz2
+Patch0:         claws-mail-fix-hidden-mainwin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  flex, bison
 BuildRequires:  glib2-devel >= 2.6.2
@@ -132,6 +134,9 @@ mails, verify signatures or sign and encrypt your own mails.
 
 %prep
 %setup -q -n claws
+
+%patch0 -p1 -b .fixhiddenmainwin
+
 ./autogen.sh
 
 %build
@@ -242,9 +247,13 @@ rm -rf %{buildroot}
 %{_libdir}/claws-mail/plugins/smime.deps
 
 %changelog
+* Sat Apr 09 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.9-0.3.20110409cvs
+- add workaround/fix for hidden window in gnome-shell (#693846)
+
 * Sun Apr 03 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.9-0.2.20110403cvs
-- pull fix for upstrean bug #2365
+- pull fix for upstream bug #2365
 
 * Tue Mar 29 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.9-0.1.20110329cvs