diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 70f7389..a247a63 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -362,7 +362,9 @@ void DockAreaWidgetPrivate::updateTitleBarButtonStates()
 		_this->features().testFlag(CDockWidget::DockWidgetClosable));
 	TitleBar->button(TitleBarButtonUndock)->setEnabled(
 		_this->features().testFlag(CDockWidget::DockWidgetFloatable));
+	// Undock and tabs should never show when overlayed
 	TitleBar->button(TitleBarButtonUndock)->setVisible(!_this->isOverlayed());
+	TitleBar->button(TitleBarButtonTabsMenu)->setVisible(!_this->isOverlayed());
 	TitleBar->updateDockWidgetActionsButtons();
 	UpdateTitleBarButtons = false;
 }