diff --git a/ChangeLog b/ChangeLog
index 223ab39d..805a9528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.13
+*05/05/07:
+  * Fix titlebar transparency in some (tabbed) cases (Simon)
+    FbWinFrame.cc
 *05/05/06:
   * Added new Buttons for the Titlebar of a Window (Mathias)
     - Shade - just like the "Stick"-button
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index cdbc6c14..2b94ae3c 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -271,7 +271,7 @@ void FbWinFrame::setFocus(bool newvalue) {
 
     m_focused = newvalue;
 
-    if (theme().focusedAlpha() != theme().unfocusedAlpha()) {
+    if (FbTk::Transparent::haveRender() && theme().focusedAlpha() != theme().unfocusedAlpha()) {
         unsigned char alpha = (m_focused?theme().focusedAlpha():theme().unfocusedAlpha());
         if (FbTk::Transparent::haveComposite()) {
             m_window.setOpaque(alpha);
@@ -280,6 +280,8 @@ void FbWinFrame::setFocus(bool newvalue) {
             LabelList::iterator btn_it_end = m_labelbuttons.end();        
             for (; btn_it != btn_it_end; ++btn_it) {
                 (*btn_it)->setAlpha(alpha);
+                if (m_current_label != (*btn_it))
+                    (*btn_it)->updateBackground(false);
             }
         }
     }