diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index e86de2b7de6a..806ac3d3a823 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -298,10 +298,12 @@ bool FocusManager::HandleKeyEvent(
                 }
                 case PC_PanelContent:
                     // Return focus to tab bar sidebar settings button or panel title.
-                    if (!IsDeckTitleVisible() && maPanels.size() == 1)
+                    if ((!IsDeckTitleVisible() && maPanels.size() == 1) ||
+                        (!maPanels[aLocation.mnIndex]->GetTitleBar()->GetVisible()))
                         FocusButton(0);
                     else
                         FocusPanel(aLocation.mnIndex, true);
+
                     bConsumed = true;
                     break;
                 default: