2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 23e7751..c0ad38a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0.1:
+*07/11/16:
+   * Using ToggleDecor from Deco=TAB should hide tabs (thanks Tomas Janousek)
+     Window.cc
 *07/11/12:
    * Allow arbitrary window patterns for the iconbar mode (Mark)
      - Note: for now, if you match against the current head of a window, it will
diff --git a/src/Window.cc b/src/Window.cc
index d5bdf39..78b30c2 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1547,7 +1547,7 @@ void FluxboxWindow::setFullscreen(bool flag) {
 
         frame().setUseShape(true);
         if (m_toggled_decos) {
-            if (m_old_decoration_mask & DECORM_TITLEBAR)
+            if (m_old_decoration_mask & (DECORM_TITLEBAR | DECORM_TAB))
                 setDecorationMask(DECOR_NONE);
             else
                 setDecorationMask(DECOR_NORMAL);
@@ -3050,7 +3050,7 @@ void FluxboxWindow::toggleDecoration() {
 
     if (m_toggled_decos) {
         m_old_decoration_mask = decorationMask();
-        if (decorations.titlebar)
+        if (decorations.titlebar | decorations.tab)
             setDecorationMask(DECOR_NONE);
         else
             setDecorationMask(DECOR_NORMAL);