diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index b7e1f03a93..097de8e2d5 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -330,7 +330,7 @@ Menuset
 		Separator
 		Item "Split View Into Left and Right Half|i" "split-view horizontal"
 		Item "Split View Into Upper and Lower Half|e" "split-view vertical"
-		Item "Close Current View|w" "close-tab-group"
+		OptItem "Close Current View|w" "close-tab-group"
 		Item "Fullscreen|l" "ui-toggle fullscreen"	
 		Submenu "Toolbars|b" "toolbars"
 		Separator
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index ca636329d6..52a4379fa7 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1702,7 +1702,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		break;
 
 	case LFUN_CLOSE_TAB_GROUP:
-		enable = d.currentTabWorkArea();
+		enable = d.tabWorkAreaCount() > 1;
 		break;
 
 	case LFUN_TOOLBAR_TOGGLE: {