Addition of focus_on_click to notebookbar ui files

(automatic rewrite) Change-Id: I959b58b3b0b69de9344b0f7188594a19e8b9d4ea Reviewed-on: https://gerrit.libreoffice.org/48176 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
author: Maxim Monastirsky <momonasmon@gmail.com> 2018-01-19 03:39:44 +0200
committer: Maxim Monastirsky <momonasmon@gmail.com> 2018-01-20 22:50:00 +0100
commit: 5f650f72861d94c7c173bc16de9331c3c1c305d5 (patch)
tree: 1b2de68f129017dc77bb097fd8f8434d5d0015db
parent: 2a2b37202a735b34da914c03b2f6e1495f833b51 (diff)
13 files changed, 616 insertions, 6 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 283b9fc6d3d8..7012ed6c1ee9 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -216,6 +216,7 @@
                   <object class="vcllo-SmallButton" id="OpenFromCalc">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:OpenFromCalc</property>
                     <property name="image">OpenImg</property>
@@ -232,6 +233,7 @@
                   <object class="vcllo-SmallButton" id="Save">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Save</property>
                     <property name="image">SaveImg</property>
@@ -248,6 +250,7 @@
                   <object class="vcllo-SmallButton" id="SaveAs">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:SaveAs</property>
                     <property name="image">SaveAsImg</property>
@@ -264,6 +267,7 @@
                   <object class="vcllo-SmallButton" id="OpenRemote">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:OpenRemote</property>
                     <property name="image">OpenRemoteImg</property>
@@ -284,6 +288,7 @@
                       <object class="vcllo-SmallButton" id="ExportTo">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ExportTo</property>
                         <property name="image">ExportToImg</property>
@@ -314,6 +319,7 @@
                       <object class="GtkButton" id="ExportToPDF">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ExportToPDF</property>
                         <property name="image">ExportToPDFImg</property>
@@ -340,6 +346,7 @@
                   <object class="vcllo-SmallButton" id="Print">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Print</property>
                     <property name="image">PrintImg</property>
@@ -360,6 +367,7 @@
                       <object class="GtkButton" id="Signature">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Signature</property>
                         <property name="image">SignatureImg</property>
@@ -404,6 +412,7 @@
                   <object class="vcllo-SmallButton" id="Paste">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Paste</property>
                     <property name="image">PasteImg</property>
@@ -426,6 +435,7 @@
                       <object class="GtkButton" id="Cut">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Cut</property>
                         <property name="relief">none</property>
@@ -441,6 +451,7 @@
                       <object class="GtkButton" id="Copy">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Copy</property>
                         <property name="relief">none</property>
@@ -468,6 +479,7 @@
                         <property name="label" translatable="yes" context="notebookbar|FormatPaintbrush">Clone</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:FormatPaintbrush</property>
                         <property name="image">FormatPaintbrushImg1</property>
@@ -1397,6 +1409,7 @@
                               <object class="svtlo-ManagedMenuButton" id="ConditionalFormatMenu">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:ConditionalFormatMenu</property>
                                 <property name="relief">none</property>
@@ -1412,6 +1425,7 @@
                               <object class="GtkButton" id="ToggleMergeCells">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:ToggleMergeCells</property>
                                 <property name="relief">none</property>
@@ -1615,6 +1629,7 @@
                               <object class="GtkButton" id="SearchDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:SearchDialog</property>
                                 <property name="relief">none</property>
@@ -1630,6 +1645,7 @@
                               <object class="GtkButton" id="DataSort">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:DataSort</property>
                                 <property name="relief">none</property>
@@ -1699,6 +1715,7 @@
                       <object class="vcllo-SmallButton" id="DataDataPilotRun">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:DataDataPilotRun</property>
                         <property name="relief">none</property>
@@ -1742,6 +1759,7 @@
                           <object class="vcllo-SmallButton" id="InsertGraphic">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertGraphic</property>
                             <property name="image">InsertGraphicImg</property>
@@ -1758,6 +1776,7 @@
                           <object class="vcllo-SmallButton" id="InsertAVMedia">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|InsertAVMedia|tooltip_text">Insert Audio or Video</property>
                             <property name="action_name">.uno:InsertAVMedia</property>
@@ -1792,6 +1811,7 @@
                   <object class="vcllo-SmallButton" id="InsertObjectChart">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertObjectChart</property>
                     <property name="image">InsertObjectChartImg</property>
@@ -1808,6 +1828,7 @@
                   <object class="GtkButton" id="FunctionDialog">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:FunctionDialog</property>
                     <property name="image">PlaceholderImg</property>
@@ -1841,6 +1862,7 @@
                       <object class="vcllo-SmallButton" id="EditHeaderAndFooter">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:EditHeaderAndFooter</property>
                         <property name="image">EditHeaderAndFooterImg</property>
@@ -1867,6 +1889,7 @@
                   <object class="vcllo-SmallButton" id="InsertAnnotation">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertAnnotation</property>
                     <property name="image">InsertAnnotationImg</property>
@@ -1887,6 +1910,7 @@
                       <object class="vcllo-SmallButton" id="HyperlinkDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:HyperlinkDialog</property>
                         <property name="image">HyperlinkDialogImg</property>
@@ -1918,6 +1942,7 @@
                         <property name="label" translatable="yes" context="notebookbar|InsertSymbol">Symbol</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertSymbol</property>
                         <property name="image">InsertSymbolImg</property>
@@ -1944,6 +1969,7 @@
                   <object class="vcllo-SmallButton" id="InsertObjectStarMath">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertObjectStarMath</property>
                     <property name="image">InsertObjectStarMathImg</property>
@@ -1981,6 +2007,7 @@
                           <object class="vcllo-SmallButton" id="DrawText">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DrawText</property>
                             <property name="image">DrawTextImg</property>
@@ -2039,6 +2066,7 @@
                       <object class="vcllo-SmallButton" id="PageFormatDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:PageFormatDialog</property>
                         <property name="image">PageFormatDialogImg</property>
@@ -2055,6 +2083,7 @@
                       <object class="vcllo-SmallButton" id="EditPrintArea">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:EditPrintArea</property>
                         <property name="image">EditPrintAreaImg</property>
@@ -2090,6 +2119,7 @@
                             <property name="label" translatable="yes" context="notebookbar|ToggleSheetGrid">Toggle Grid Lines</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ToggleSheetGrid</property>
                             <property name="relief">none</property>
@@ -2105,6 +2135,7 @@
                           <object class="GtkButton" id="ViewRowColumnHeaders">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ViewRowColumnHeaders</property>
                             <property name="relief">none</property>
@@ -2150,6 +2181,7 @@
                   <object class="vcllo-SmallButton" id="BringToFront">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:BringToFront</property>
                     <property name="image">BringToFrontImg</property>
@@ -2166,6 +2198,7 @@
                   <object class="vcllo-SmallButton" id="SendToBack">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:SendToBack</property>
                     <property name="image">SendToBackImg</property>
@@ -2190,6 +2223,7 @@
                           <object class="vcllo-SmallButton" id="FormatGroup">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:FormatGroup</property>
                             <property name="image">FormatGroupImg</property>
@@ -2206,6 +2240,7 @@
                           <object class="vcllo-SmallButton" id="FormatUngroup">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:FormatUngroup</property>
                             <property name="image">FormatUngroupImg</property>
@@ -2268,6 +2303,7 @@
                           <object class="GtkButton" id="ManageXMLSource">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ManageXMLSource</property>
                             <property name="image">PlaceholderImg</property>
@@ -2284,6 +2320,7 @@
                           <object class="GtkButton" id="DataStreams">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DataStreams</property>
                             <property name="image">PlaceholderImg</property>
@@ -2330,6 +2367,7 @@
                   <object class="GtkButton" id="Calculate">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Calculate</property>
                     <property name="image">PlaceholderImg</property>
@@ -2370,6 +2408,7 @@
                           <object class="GtkButton" id="SortAscending">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SortAscending</property>
                             <property name="relief">none</property>
@@ -2385,6 +2424,7 @@
                           <object class="GtkButton" id="SortDescending">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SortDescending</property>
                             <property name="relief">none</property>
@@ -2417,6 +2457,7 @@
                   <object class="vcllo-SmallButton" id="DataSort1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:DataSort</property>
                     <property name="image">DataSortImg</property>
@@ -2433,6 +2474,7 @@
                   <object class="vcllo-SmallButton" id="DataFilterAutoFilter">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:DataFilterAutoFilter</property>
                     <property name="image">DataFilterAutoFilterImg</property>
@@ -2455,6 +2497,7 @@
                       <object class="GtkButton" id="DataFilterStandardFilter">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:DataFilterStandardFilter</property>
                         <property name="relief">none</property>
@@ -2470,6 +2513,7 @@
                       <object class="GtkButton" id="DataFilterSpecialFilter">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:DataFilterSpecialFilter</property>
                         <property name="relief">none</property>
@@ -2510,6 +2554,7 @@
                       <object class="GtkButton" id="DataFilterRemoveFilter">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:DataFilterRemoveFilter</property>
                         <property name="relief">none</property>
@@ -2525,6 +2570,7 @@
                       <object class="GtkButton" id="DataFilterHideAutoFilter">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:DataFilterHideAutoFilter</property>
                         <property name="relief">none</property>
@@ -2555,6 +2601,7 @@
                           <object class="GtkButton" id="TextToColumns">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:TextToColumns</property>
                             <property name="image">PlaceholderImg</property>
@@ -2571,6 +2618,7 @@
                           <object class="GtkButton" id="Validation">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Validation</property>
                             <property name="image">PlaceholderImg</property>
@@ -2612,6 +2660,7 @@
                           <object class="GtkButton" id="DataConsolidate">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DataConsolidate</property>
                             <property name="image">PlaceholderImg</property>
@@ -2628,6 +2677,7 @@
                           <object class="GtkButton" id="DataSubTotals">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DataSubTotals</property>
                             <property name="image">PlaceholderImg</property>
@@ -2669,6 +2719,7 @@
                           <object class="GtkButton" id="DataForm">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DataForm</property>
                             <property name="image">PlaceholderImg</property>
@@ -2685,6 +2736,7 @@
                           <object class="GtkButton" id="TableOperationDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:TableOperationDialog</property>
                             <property name="image">PlaceholderImg</property>
@@ -2739,6 +2791,7 @@
                   <object class="vcllo-SmallButton" id="SpellDialog">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:SpellDialog</property>
                     <property name="image">SpellDialogImg</property>
@@ -2756,6 +2809,7 @@
                     <property name="label" translatable="yes" context="notebookbar|SpellOnline">Auto Spellcheck</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:SpellOnline</property>
                     <property name="image">SpellOnlineImg</property>
@@ -2776,6 +2830,7 @@
                       <object class="vcllo-SmallButton" id="ThesaurusDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ThesaurusDialog</property>
                         <property name="image">ThesaurusDialogImg</property>
@@ -2815,6 +2870,7 @@
                   <object class="vcllo-SmallButton" id="InsertAnnotation1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertAnnotation</property>
                     <property name="image">InsertAnnotationImg1</property>
@@ -2842,6 +2898,7 @@
                           <object class="GtkButton" id="EditAnnotation">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:EditAnnotation</property>
                             <property name="relief">none</property>
@@ -2857,6 +2914,7 @@
                           <object class="GtkButton" id="DeleteNote">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DeleteNote</property>
                             <property name="relief">none</property>
@@ -2900,6 +2958,7 @@
                           <object class="GtkButton" id="HideNote">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:HideNote</property>
                             <property name="relief">none</property>
@@ -2915,6 +2974,7 @@
                           <object class="GtkButton" id="ShowNote">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ShowNote</property>
                             <property name="relief">none</property>
@@ -2968,6 +3028,7 @@
                           <object class="vcllo-SmallButton" id="Protect">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Protect</property>
                             <property name="image">ProtectImg</property>
@@ -2984,6 +3045,7 @@
                           <object class="vcllo-SmallButton" id="ToolProtectionDocument">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ToolProtectionDocument</property>
                             <property name="image">ToolProtectionDocumentImg</property>
@@ -3000,6 +3062,7 @@
                           <object class="GtkButton" id="ShareDocument">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ShareDocument</property>
                             <property name="image">PlaceholderImg</property>
@@ -3058,6 +3121,7 @@
                       <object class="GtkButton" id="NormalViewMode">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:NormalViewMode</property>
                         <property name="image">PlaceholderImg</property>
@@ -3074,6 +3138,7 @@
                       <object class="GtkButton" id="PagebreakMode">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:PagebreakMode</property>
                         <property name="image">PlaceholderImg</property>
@@ -3119,6 +3184,7 @@
                             <property name="label" translatable="yes" context="notebookbar|ToggleSheetGrid2">Toggle Grid Lines</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ToggleSheetGrid</property>
                             <property name="image">ToggleSheetGridImg</property>
@@ -3135,6 +3201,7 @@
                           <object class="GtkButton" id="ViewValueHighlighting">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ViewValueHighlighting</property>
                             <property name="image">PlaceholderImg</property>
@@ -3151,6 +3218,7 @@
                           <object class="GtkButton" id="ViewRowColumnHeaders1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ViewRowColumnHeaders</property>
                             <property name="image">PlaceholderImg</property>
@@ -3201,6 +3269,7 @@
                       <object class="vcllo-SmallButton" id="Zoom">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Zoom</property>
                         <property name="image">ZoomImg</property>
@@ -3223,6 +3292,7 @@
                           <object class="GtkButton" id="Zoom100Percent">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Zoom100Percent</property>
                             <property name="relief">none</property>
@@ -3238,6 +3308,7 @@
                           <object class="GtkButton" id="ZoomPageWidth">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ZoomPageWidth</property>
                             <property name="relief">none</property>
@@ -3288,6 +3359,7 @@
                           <object class="vcllo-SmallButton" id="SplitWindow">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SplitWindow</property>
                             <property name="image">SplitWindowImg</property>
@@ -3304,6 +3376,7 @@
                           <object class="vcllo-SmallButton" id="FreezePanes">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:FreezePanes</property>
                             <property name="image">FreezePanesImg</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 2d67834f311e..d4d50d25b17a 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -4643,6 +4643,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -4782,6 +4783,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -4939,6 +4941,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5092,6 +5095,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatb">F_ont</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5315,6 +5319,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|numberb">_Number</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5470,6 +5475,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Alignment</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5633,6 +5639,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|cellb">_Cells</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5772,6 +5779,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
@@ -5901,6 +5909,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|datab">_Data</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6011,6 +6020,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6120,6 +6130,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
@@ -6262,6 +6273,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6366,6 +6378,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6705,6 +6718,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrange">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6865,6 +6879,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6985,6 +7000,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|languageb">_Language</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -7111,6 +7127,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|revieb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7261,6 +7278,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|commentsb">_Comments</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -7361,6 +7379,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|compareb">Com_pare</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -7461,6 +7480,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewA">_View</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -7634,6 +7654,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">_Styles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -7850,6 +7871,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawb">D_raw</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8040,6 +8062,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeD">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8149,6 +8172,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Grid">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8258,6 +8282,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8366,6 +8391,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8549,6 +8575,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">F_rame</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -8756,6 +8783,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeO">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8865,6 +8893,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridO">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8975,6 +9004,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewO">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9080,6 +9110,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">_Styles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9255,6 +9286,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formats">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9527,6 +9559,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphS">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9685,6 +9718,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewS">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9795,6 +9829,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -9850,6 +9885,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 16e466183a6c..5aee0e4c72fc 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -4589,6 +4589,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|fileb">_File</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -4811,6 +4812,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -5007,6 +5009,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstyleb">St_yles</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5278,6 +5281,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatb">F_ont</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5525,6 +5529,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|numberb">_Number</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
@@ -5736,6 +5741,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphb">_Alignment</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5974,6 +5980,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|cellb">_Cells</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
@@ -6147,6 +6154,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertb">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6317,6 +6325,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|datab">_Data</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="relief">none</property>
                                         <property name="use_underline">True</property>
@@ -6500,6 +6509,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6668,6 +6678,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6889,6 +6900,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7240,6 +7252,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrange">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7389,6 +7402,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7640,6 +7654,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7776,6 +7791,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|languageb">_Language</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -8001,6 +8017,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|revieb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8213,6 +8230,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|commentsb">_Comments</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8415,6 +8433,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|compareb">Com_pare</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8613,6 +8632,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewa">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9055,6 +9075,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawb">D_raw</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9425,6 +9446,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">_Edit</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9762,6 +9784,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9926,6 +9949,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10124,6 +10148,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewDrawb">Grou_p</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10273,6 +10298,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|3Db">3_D</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10580,6 +10606,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ont</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10845,6 +10872,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Alignment</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11043,6 +11071,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewd">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11193,6 +11222,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextb">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11334,6 +11364,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|media">_Media</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11571,6 +11602,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|oleB">F_rame</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12001,6 +12033,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrageOLE">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12164,6 +12197,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|OleGridB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12362,6 +12396,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewf">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12509,6 +12544,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -12561,6 +12597,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -12615,6 +12652,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_Help</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
index e17b27c62e2a..be5377a13c19 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
@@ -380,6 +380,7 @@
                       <object class="GtkButton" id="newb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -399,6 +400,7 @@
                       <object class="GtkButton" id="openb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -431,6 +433,7 @@
                         <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="vexpand">True</property>
                         <property name="action_name">.uno:Save</property>
@@ -462,6 +465,7 @@
                       <object class="GtkButton" id="pdfb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -481,6 +485,7 @@
                       <object class="GtkButton" id="printb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -583,6 +588,7 @@
                         <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="halign">start</property>
                         <property name="vexpand">True</property>
@@ -615,6 +621,7 @@
                       <object class="GtkButton" id="redob">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -634,6 +641,7 @@
                       <object class="GtkButton" id="undob">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -730,6 +738,7 @@
                     <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:DesignerDialog</property>
                     <property name="image">paragraphstylei</property>
@@ -973,6 +982,7 @@
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
@@ -995,6 +1005,7 @@
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
@@ -1035,10 +1046,10 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:AlignLeft</property>
                         <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -1053,6 +1064,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:AlignHorizontalCenter</property>
                         <property name="relief">none</property>
@@ -1070,6 +1082,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:AlignRight</property>
                         <property name="relief">none</property>
@@ -1099,11 +1112,11 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Bold</property>
                         <property name="image">boldi</property>
                         <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -1117,6 +1130,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Italic</property>
                         <property name="image">italicsi</property>
@@ -1134,6 +1148,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Underline</property>
                         <property name="relief">none</property>
@@ -1329,6 +1344,7 @@
                           <object class="svtlo-ManagedMenuButton" id="tablerowsb">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1346,6 +1362,7 @@
                           <object class="svtlo-ManagedMenuButton" id="tablecolumnsb">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1376,6 +1393,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|mergeb">Merge</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1394,6 +1412,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|splitb">Split</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1425,6 +1444,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DataSort</property>
                             <property name="relief">none</property>
@@ -1441,6 +1461,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DataFilterAutoFilter</property>
                             <property name="relief">none</property>
@@ -1458,6 +1479,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ConditionalFormatMenu</property>
                             <property name="relief">none</property>
@@ -1584,6 +1606,7 @@
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:AlignTop</property>
                             <property name="relief">none</property>
@@ -1601,6 +1624,7 @@
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:AlignVCenter</property>
                             <property name="relief">none</property>
@@ -1618,6 +1642,7 @@
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:AlignBottom</property>
                             <property name="relief">none</property>
@@ -1757,6 +1782,7 @@
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="image">linksi</property>
                             <property name="relief">none</property>
@@ -1786,6 +1812,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertGraphic</property>
                             <property name="relief">none</property>
@@ -1802,6 +1829,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertObjectChart</property>
                             <property name="image">charti</property>
@@ -1819,6 +1847,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertAnnotation</property>
                             <property name="relief">none</property>
@@ -1902,6 +1931,7 @@
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="image">paragraphstylei</property>
                         <property name="relief">none</property>
@@ -1923,6 +1953,7 @@
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1941,6 +1972,7 @@
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1969,6 +2001,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertCaptionDialog</property>
                             <property name="relief">none</property>
@@ -1985,6 +2018,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="relief">none</property>
                           </object>
@@ -2000,6 +2034,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="relief">none</property>
                           </object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 292b7aa1383c..581c8c764b56 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -207,6 +207,7 @@
                   <object class="vcllo-SmallButton" id="Open">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Open</property>
                     <property name="image">OpenImg</property>
@@ -223,6 +224,7 @@
                   <object class="vcllo-SmallButton" id="Save">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Save</property>
                     <property name="image">SaveImg</property>
@@ -239,6 +241,7 @@
                   <object class="vcllo-SmallButton" id="SaveAs">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:SaveAs</property>
                     <property name="image">SaveAsImg</property>
@@ -255,6 +258,7 @@
                   <object class="vcllo-SmallButton" id="OpenRemote">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:OpenRemote</property>
                     <property name="image">OpenRemoteImg</property>
@@ -271,6 +275,7 @@
                   <object class="vcllo-SmallButton" id="ExportTo">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:ExportTo</property>
                     <property name="image">ExportToImg</property>
@@ -287,6 +292,7 @@
                   <object class="GtkButton" id="ExportToPDF">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:ExportToPDF</property>
                     <property name="image">ExportToPDFImg</property>
@@ -303,6 +309,7 @@
                   <object class="vcllo-SmallButton" id="Print">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Print</property>
                     <property name="image">PrintImg</property>
@@ -319,6 +326,7 @@
                   <object class="GtkButton" id="Signature">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Signature</property>
                     <property name="image">SignatureImg</property>
@@ -362,6 +370,7 @@
                           <object class="vcllo-SmallButton" id="Paste">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Paste</property>
                             <property name="image">PasteImg</property>
@@ -383,6 +392,7 @@
                               <object class="GtkButton" id="Cut">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:Cut</property>
                                 <property name="relief">none</property>
@@ -398,6 +408,7 @@
                               <object class="GtkButton" id="Copy">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:Copy</property>
                                 <property name="relief">none</property>
@@ -421,6 +432,7 @@
                             <property name="label" translatable="yes" context="notebookbar|FormatPaintbrush">Clone</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:FormatPaintbrush</property>
                             <property name="image">FormatPaintbrushImg</property>
@@ -461,6 +473,7 @@
                           <object class="vcllo-SmallButton" id="InsertSlide">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertPage</property>
                             <property name="relief">none</property>
@@ -1400,6 +1413,7 @@
                           <object class="vcllo-SmallButton" id="BringToFront">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:BringToFront</property>
                             <property name="image">BringToFrontImg</property>
@@ -1422,6 +1436,7 @@
                               <object class="GtkButton" id="Forward">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:Forward</property>
                                 <property name="relief">none</property>
@@ -1437,6 +1452,7 @@
                               <object class="GtkButton" id="Backward">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:Backward</property>
                                 <property name="relief">none</property>
@@ -1459,6 +1475,7 @@
                           <object class="vcllo-SmallButton" id="SendToBack">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SendToBack</property>
                             <property name="image">SendToBackImg</property>
@@ -1515,6 +1532,7 @@
                   <object class="vcllo-SmallButton" id="InsertSlide1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertPage</property>
                     <property name="image">InsertSlideImg</property>
@@ -1544,6 +1562,7 @@
                   <object class="vcllo-SmallButton" id="InsertTable">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertTable</property>
                     <property name="image">InsertTableImg</property>
@@ -1577,6 +1596,7 @@
                       <object class="vcllo-SmallButton" id="InsertGraphic">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertGraphic</property>
                         <property name="image">InsertGraphicImg</property>
@@ -1599,6 +1619,7 @@
                           <object class="GtkButton" id="PhotoAlbumDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:PhotoAlbumDialog</property>
                             <property name="relief">none</property>
@@ -1614,6 +1635,7 @@
                           <object class="GtkButton" id="InsertAVMedia">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|InsertAVMedia|tooltip_text">Insert Audio or Video</property>
                             <property name="action_name">.uno:InsertAVMedia</property>
@@ -1637,6 +1659,7 @@
                       <object class="vcllo-SmallButton" id="InsertObjectChart">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertObjectChart</property>
                         <property name="image">InsertObjectChartImg</property>
@@ -1830,6 +1853,7 @@
                       <object class="vcllo-SmallButton" id="HyperlinkDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:HyperlinkDialog</property>
                         <property name="image">HyperlinkDialogImg</property>
@@ -1846,6 +1870,7 @@
                       <object class="vcllo-SmallButton" id="InsertAnnotation">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertAnnotation</property>
                         <property name="image">InsertAnnotationImg</property>
@@ -1862,6 +1887,7 @@
                       <object class="vcllo-SmallButton" id="Text2">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Text</property>
                         <property name="image">TextImg</property>
@@ -1878,6 +1904,7 @@
                       <object class="vcllo-SmallButton" id="HeaderAndFooter">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:HeaderAndFooter</property>
                         <property name="image">HeaderAndFooterImg</property>
@@ -1894,6 +1921,7 @@
                       <object class="vcllo-SmallButton" id="FontworkGalleryFloater">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:FontworkGalleryFloater</property>
                         <property name="image">FontworkGalleryFloaterImg</property>
@@ -1935,6 +1963,7 @@
                         <property name="label" translatable="yes" context="notebookbar|InsertSymbol">Symbol</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertSymbol</property>
                         <property name="image">InsertSymbolImg</property>
@@ -1951,6 +1980,7 @@
                       <object class="vcllo-SmallButton" id="InsertMath">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertMath</property>
                         <property name="image">InsertMathImg</property>
@@ -1987,6 +2017,7 @@
                   <object class="vcllo-SmallButton" id="ImportFromFile">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:ImportFromFile</property>
                     <property name="image">InsertMathImg1</property>
@@ -2070,6 +2101,7 @@
                       <object class="vcllo-SmallButton" id="Presentation">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Presentation</property>
                         <property name="image">PresentationImg</property>
@@ -2086,6 +2118,7 @@
                       <object class="vcllo-SmallButton" id="PresentationCurrentSlide">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:PresentationCurrentSlide</property>
                         <property name="image">PresentationCurrentSlideImg</property>
@@ -2126,6 +2159,7 @@
                       <object class="vcllo-SmallButton" id="RehearseTimings">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:RehearseTimings</property>
                         <property name="image">RehearseTimingsImg</property>
@@ -2142,6 +2176,7 @@
                       <object class="GtkButton" id="CustomShowDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:CustomShowDialog</property>
                         <property name="image">PlaceholderImg</property>
@@ -2158,6 +2193,7 @@
                       <object class="GtkButton" id="Remote">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Remote</property>
                         <property name="image">PlaceholderImg</property>
@@ -2194,6 +2230,7 @@
                   <object class="GtkButton" id="PresentationDialog">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:PresentationDialog</property>
                     <property name="image">PresentationDialogImg</property>
@@ -2235,6 +2272,7 @@
                       <object class="vcllo-SmallButton" id="SpellDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:SpellDialog</property>
                         <property name="image">SpellDialogImg</property>
@@ -2252,6 +2290,7 @@
                         <property name="label" translatable="yes" context="notebookbar|SpellOnline">Auto Spellcheck</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:SpellOnline</property>
                         <property name="image">SpellOnlineImg</property>
@@ -2268,6 +2307,7 @@
                       <object class="vcllo-SmallButton" id="ThesaurusDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ThesaurusDialog</property>
                         <property name="image">ThesaurusDialogImg</property>
@@ -2308,6 +2348,7 @@
                       <object class="vcllo-SmallButton" id="InsertAnnotation1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertAnnotation</property>
                         <property name="image">InsertAnnotationImg</property>
@@ -2371,6 +2412,7 @@
                       <object class="GtkButton" id="NormalMultiPaneGUI">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:NormalMultiPaneGUI</property>
                         <property name="image">PlaceholderImg</property>
@@ -2387,6 +2429,7 @@
                       <object class="GtkButton" id="OutlineMode">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:OutlineMode</property>
                         <property name="image">PlaceholderImg</property>
@@ -2409,6 +2452,7 @@
                           <object class="GtkButton" id="NotesMode">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:NotesMode</property>
                             <property name="relief">none</property>
@@ -2424,6 +2468,7 @@
                           <object class="GtkButton" id="DiaMode">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DiaMode</property>
                             <property name="relief">none</property>
@@ -2452,6 +2497,7 @@
                           <object class="GtkButton" id="SlideMasterPage">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SlideMasterPage</property>
                             <property name="relief">none</property>
@@ -2467,6 +2513,7 @@
                           <object class="GtkButton" id="NotesMasterPage">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:NotesMasterPage</property>
                             <property name="relief">none</property>
@@ -2489,6 +2536,7 @@
                       <object class="GtkButton" id="HandoutMode">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:HandoutMode</property>
                         <property name="image">PlaceholderImg</property>
@@ -2531,6 +2579,7 @@
                       <object class="GtkButton" id="ShowRuler">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ShowRuler</property>
                         <property name="relief">none</property>
@@ -2547,6 +2596,7 @@
                         <property name="label" translatable="yes" context="notebookbar|GridVisible">Grid</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:GridVisible</property>
                         <property name="relief">none</property>
@@ -2569,6 +2619,7 @@
                   <object class="vcllo-SmallButton" id="ShowAnnotations">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:ShowAnnotations</property>
                     <property name="image">ShowAnnotationsImg</property>
@@ -2602,6 +2653,7 @@
                       <object class="vcllo-SmallButton" id="Zoom">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Zoom</property>
                         <property name="image">ZoomImg</property>
@@ -2618,6 +2670,7 @@
                       <object class="vcllo-SmallButton" id="ZoomOptimal">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ZoomOptimal</property>
                         <property name="image">ZoomOptimalImg</property>
@@ -2634,6 +2687,7 @@
                       <object class="vcllo-SmallButton" id="ZoomPage">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ZoomPage</property>
                         <property name="image">ZoomPageImg</property>
@@ -2674,6 +2728,7 @@
                       <object class="GtkButton" id="OutputQualityColor">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:OutputQualityColor</property>
                         <property name="image">PlaceholderImg</property>
@@ -2690,6 +2745,7 @@
                       <object class="GtkButton" id="OutputQualityGrayscale">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:OutputQualityGrayscale</property>
                         <property name="image">PlaceholderImg</property>
@@ -2706,6 +2762,7 @@
                       <object class="GtkButton" id="OutputQualityBlackWhite">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:OutputQualityBlackWhite</property>
                         <property name="image">PlaceholderImg</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 6df26abf0b2e..1af82ac25c3d 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -2575,6 +2575,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -2714,6 +2715,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -2884,6 +2886,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Slide Show</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -3012,6 +3015,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">S_lide</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -3163,6 +3167,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertText">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -3332,6 +3337,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">D_raw</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -3616,6 +3622,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -3767,6 +3774,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
@@ -3906,6 +3914,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|slideshowf">_Slide Show</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -4071,6 +4080,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatt">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -4321,6 +4331,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -4492,6 +4503,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertTextO">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -4626,6 +4638,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewT">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -4777,6 +4790,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
@@ -4914,6 +4928,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|slideshowb">_Slide Show</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -5079,6 +5094,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatt">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5329,6 +5345,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5479,6 +5496,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">R_ows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -5795,6 +5813,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|calculatet">_Calc</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -5987,6 +6006,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6214,6 +6234,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawb">D_raw</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6585,6 +6606,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6694,6 +6716,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridO">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6836,6 +6859,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -7008,6 +7032,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7123,6 +7148,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -7596,6 +7622,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7732,6 +7759,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|slideshowOLE">_Slide Show</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7957,6 +7985,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">F_rame</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -8350,6 +8379,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -8484,6 +8514,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewOLE">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -8663,6 +8694,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">_Master Page</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -8808,6 +8840,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertTextb">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -9016,6 +9049,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawMaster">D_raw</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -9391,6 +9425,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewMaster">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -9526,6 +9561,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -9581,6 +9617,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index 5bbaa6ab0f35..402b9bb67929 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -3227,6 +3227,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|fileb">_File</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -3449,6 +3450,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -3608,6 +3610,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowb">_Slide Show</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -3805,6 +3808,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">S_lide</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -3956,6 +3960,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertText">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -4302,6 +4307,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|draw">D_raw</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -4486,6 +4492,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -4632,6 +4639,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -4920,6 +4928,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5075,6 +5084,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowt">_Slide Show</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5327,6 +5337,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5651,6 +5662,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5894,6 +5906,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextt">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6056,6 +6069,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewt">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6202,6 +6216,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6339,6 +6354,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowtt">_Slide Show</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6592,6 +6608,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6918,6 +6935,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7097,6 +7115,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|tabled">T_able</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7362,6 +7381,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|rowscolumnst">R_ows</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7482,6 +7502,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|calculatet">_Calc</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7818,6 +7839,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawb">D_raw</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8114,6 +8136,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">_Edit</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8526,6 +8549,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8677,6 +8701,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8819,6 +8844,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewDrawb">Grou_p</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -8958,6 +8984,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|3Db">3_D</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9216,6 +9243,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9387,6 +9415,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9790,6 +9819,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9941,6 +9971,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10344,6 +10375,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|media">_Media</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10520,6 +10552,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowOLE">_Slide Show</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10805,6 +10838,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">F_rame</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11217,6 +11251,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11368,6 +11403,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11514,6 +11550,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewtOLE">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11674,6 +11711,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|oleB">_Master Page</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11912,6 +11950,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextm">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12141,6 +12180,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawm">D_raw</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12467,6 +12507,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12629,6 +12670,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|masterviewm">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12749,6 +12791,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -12801,6 +12844,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -12855,6 +12899,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_Help</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
index 1ceb60b0a4aa..2ac51b82332a 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
@@ -339,6 +339,7 @@
                       <object class="GtkButton" id="newb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -358,6 +359,7 @@
                       <object class="GtkButton" id="openb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -390,6 +392,7 @@
                         <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="vexpand">True</property>
                         <property name="action_name">.uno:Save</property>
@@ -421,6 +424,7 @@
                       <object class="GtkButton" id="pdfb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -440,6 +444,7 @@
                       <object class="GtkButton" id="printb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -542,6 +547,7 @@
                         <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="halign">start</property>
                         <property name="vexpand">True</property>
@@ -574,6 +580,7 @@
                       <object class="GtkButton" id="redob">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -593,6 +600,7 @@
                       <object class="GtkButton" id="undob">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -689,6 +697,7 @@
                     <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:DesignerDialog</property>
                     <property name="image">paragraphstylei</property>
@@ -851,6 +860,7 @@
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
@@ -873,6 +883,7 @@
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
@@ -912,11 +923,11 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:LeftPara</property>
                         <property name="image">lefti</property>
                         <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -930,6 +941,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:CenterPara</property>
                         <property name="image">centeri</property>
@@ -947,6 +959,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:RightPara</property>
                         <property name="image">righti</property>
@@ -977,11 +990,11 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Bold</property>
                         <property name="image">boldi</property>
                         <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -995,6 +1008,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Italic</property>
                         <property name="image">italicsi</property>
@@ -1012,6 +1026,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Underline</property>
                         <property name="relief">none</property>
@@ -1135,6 +1150,7 @@
                       <object class="GtkButton" id="bulletsb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -1153,6 +1169,7 @@
                       <object class="GtkButton" id="numberingb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -1253,6 +1270,7 @@
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Presentation</property>
                         <property name="image">startshowi</property>
@@ -1275,6 +1293,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|masterb">Master</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1293,6 +1312,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|layoutb">Layout</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1323,6 +1343,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|animationb">Animation</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1340,6 +1361,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|transitionb">Transition</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1477,6 +1499,7 @@
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="image">linksi</property>
                             <property name="relief">none</property>
@@ -1506,6 +1529,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertGraphic</property>
                             <property name="relief">none</property>
@@ -1522,6 +1546,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertObjectChart</property>
                             <property name="image">charti</property>
@@ -1539,6 +1564,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertAnnotation</property>
                             <property name="relief">none</property>
@@ -1621,6 +1647,7 @@
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="image">paragraphstylei</property>
                         <property name="relief">none</property>
@@ -1642,6 +1669,7 @@
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1660,6 +1688,7 @@
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1688,6 +1717,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertCaptionDialog</property>
                             <property name="relief">none</property>
@@ -1704,6 +1734,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="relief">none</property>
                           </object>
@@ -1719,6 +1750,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="relief">none</property>
                           </object>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 4be830dd82d8..34a0fa7ef935 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -350,6 +350,7 @@
                       <object class="vcllo-SmallButton" id="New">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:AddDirect</property>
                         <property name="image">NewImg</property>
@@ -365,6 +366,7 @@
                     <child>
                       <object class="GtkButton" id="NewB">
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:AddDirect</property>
                         <property name="image">NewImg1</property>
@@ -415,6 +417,7 @@
                             <property name="label" translatable="yes" context="notebookbar|NewSW"> </property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|NewSW|tooltip_text">Text Document</property>
                             <property name="action_name">private:factory/swriter</property>
@@ -431,6 +434,7 @@
                             <property name="label" translatable="yes" context="notebookbar|NewSC"> </property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|NewSC|tooltip_text">Spreadsheet</property>
                             <property name="action_name">private:factory/scalc</property>
@@ -447,6 +451,7 @@
                             <property name="label" translatable="yes" context="notebookbar|NewSI"> </property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|NewSI|tooltip_text">Presentation</property>
                             <property name="action_name">.uno:NewPresentation</property>
@@ -463,6 +468,7 @@
                             <property name="label" translatable="yes" context="notebookbar|NewSD"> </property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|NewSD|tooltip_text">Drawing</property>
                             <property name="action_name">private:factory/sdraw</property>
@@ -479,6 +485,7 @@
                             <property name="label" translatable="yes" context="notebookbar|NewSF"> </property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|NewSF|tooltip_text">Formula</property>
                             <property name="action_name">private:factory/smath</property>
@@ -495,6 +502,7 @@
                             <property name="label" translatable="yes" context="notebookbar|NewSB"> </property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|NewSB|tooltip_text">Database</property>
                             <property name="action_name">private:factory/sdatabase?Interactive</property>
@@ -546,6 +554,7 @@
                       <object class="vcllo-SmallButton" id="Template">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:NewDoc</property>
                         <property name="image">TemplateImg</property>
@@ -653,6 +662,7 @@
                   <object class="vcllo-SmallButton" id="Open">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="margin_right">3</property>
                     <property name="action_name">.uno:Open</property>
@@ -704,6 +714,7 @@
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="action_name">.uno:RecentFileList</property>
                         <property name="image">RecentFilesImg</property>
@@ -795,6 +806,7 @@
                   <object class="vcllo-SmallButton" id="Save">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="margin_right">3</property>
                     <property name="action_name">.uno:Save</property>
@@ -844,6 +856,7 @@
                       <object class="svtlo-ManagedMenuButton" id="SaveAsB">
                         <property name="use_action_appearance">False</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="action_name">.uno:SaveAs</property>
                         <property name="image">RecentFilesImg1</property>
@@ -915,6 +928,7 @@
                       <object class="vcllo-SmallButton" id="ExportTo">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ExportTo</property>
                         <property name="image">ExportToIOmg</property>
@@ -1022,6 +1036,7 @@
                   <object class="vcllo-SmallButton" id="Print">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:Print</property>
                     <property name="image">PrintImg</property>
@@ -1156,6 +1171,7 @@
                       <object class="vcllo-SmallButton" id="DocProperties">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:SetDocumentProperties</property>
                         <property name="image">DocPropertiesImg</property>
@@ -2414,6 +2430,7 @@
                                   <object class="GtkButton" id="StyleUpdateByExample">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">True</property>
                                     <property name="action_name">.uno:StyleUpdateByExample</property>
                                     <property name="relief">none</property>
@@ -2429,6 +2446,7 @@
                                   <object class="GtkButton" id="StyleNewByExample">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">True</property>
                                     <property name="action_name">.uno:StyleNewByExample</property>
                                     <property name="relief">none</property>
@@ -2444,6 +2462,7 @@
                                   <object class="GtkButton" id="EditStyle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">True</property>
                                     <property name="action_name">.uno:EditStyle</property>
                                     <property name="relief">none</property>
@@ -2512,6 +2531,7 @@
                           <object class="vcllo-SmallButton" id="SearchDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SearchDialog</property>
                             <property name="image">SearchDialogImg</property>
@@ -2557,6 +2577,7 @@
                           <object class="GtkButton" id="GotoPage">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:GotoPage</property>
                             <property name="relief">none</property>
@@ -2573,6 +2594,7 @@
                           <object class="GtkButton" id="Navigator">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Navigator</property>
                             <property name="relief">none</property>
@@ -2644,6 +2666,7 @@
                           <object class="vcllo-SmallButton" id="InsertPagebreak">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertPagebreak</property>
                             <property name="image">InsertPagebreakImg</property>
@@ -2666,6 +2689,7 @@
                               <object class="GtkButton" id="InsertBreak1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertBreak</property>
                                 <property name="relief">none</property>
@@ -2682,6 +2706,7 @@
                               <object class="GtkButton" id="InsertSection">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertSection</property>
                                 <property name="relief">none</property>
@@ -2792,6 +2817,7 @@
                       <object class="vcllo-SmallButton" id="InsertGraphic">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertGraphic</property>
                         <property name="image">InsertGraphicImg</property>
@@ -2821,6 +2847,7 @@
                       <object class="vcllo-SmallButton" id="Gallery">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes" context="notebookbar|Gallery|tooltip_text">Open Clip Art and Media Gallery</property>
                         <property name="action_name">.uno:Gallery</property>
@@ -2849,6 +2876,7 @@
                   <object class="vcllo-SmallButton" id="InsertObjectChart">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:InsertObjectChart</property>
                     <property name="image">InsertObjectChartImg</property>
@@ -2871,6 +2899,7 @@
                       <object class="vcllo-SmallButton" id="InsertSymbol">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertSymbol</property>
                         <property name="image">InsertSymbolImg</property>
@@ -2910,6 +2939,7 @@
                           <object class="GtkButton" id="InsertObjectStarMath">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertObjectStarMath</property>
                             <property name="relief">none</property>
@@ -2925,6 +2955,7 @@
                           <object class="GtkButton" id="InsertAVMedia">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes" context="notebookbar|InsertAVMedia|tooltip_text">Insert Audio or Video</property>
                             <property name="action_name">.uno:InsertAVMedia</property>
@@ -3287,6 +3318,7 @@
                           <object class="vcllo-SmallButton" id="hyperlinkdialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:HyperlinkDialog</property>
                             <property name="image">HyperlinkDialogImg</property>
@@ -3303,6 +3335,7 @@
                           <object class="vcllo-SmallButton" id="bookmark">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertBookmark</property>
                             <property name="image">InsertBookmarkImg</property>
@@ -3319,6 +3352,7 @@
                           <object class="vcllo-SmallButton" id="insertreferencefield">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertReferenceField</property>
                             <property name="image">InsertReferenceFieldImg</property>
@@ -3374,6 +3408,7 @@
                           <object class="vcllo-SmallButton" id="DrawText">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DrawText</property>
                             <property name="image">DrawTextImg</property>
@@ -3392,6 +3427,7 @@
                             <property name="label" translatable="yes" context="notebookbar|FontWork">Fontwork</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:FontWorkGalleryFloater</property>
                             <property name="image">FontworkImg</property>
@@ -3415,6 +3451,7 @@
                               <object class="GtkButton" id="InsertFrame">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertFrame</property>
                                 <property name="relief">none</property>
@@ -3431,6 +3468,7 @@
                               <object class="GtkButton" id="InsertCaptionDialog2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertCaptionDialog</property>
                                 <property name="relief">none</property>
@@ -3500,6 +3538,7 @@
                               <object class="GtkButton" id="InsertPageNumberField">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertPageNumberField</property>
                                 <property name="relief">none</property>
@@ -3516,6 +3555,7 @@
                               <object class="GtkButton" id="InsertPageCountField">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertPageCountField</property>
                                 <property name="relief">none</property>
@@ -3742,6 +3782,7 @@
                           <object class="GtkButton" id="InsertBreak">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertBreak</property>
                             <property name="relief">none</property>
@@ -3758,6 +3799,7 @@
                           <object class="GtkButton" id="LineNumberingDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:LineNumberingDialog</property>
                             <property name="relief">none</property>
@@ -3791,6 +3833,7 @@
                   <object class="vcllo-SmallButton" id="PageDialog">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:PageDialog</property>
                     <property name="image">PageDialogImg</property>
@@ -3949,6 +3992,7 @@
                       <object class="vcllo-SmallButton" id="InsertMultiIndex">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertMultiIndex</property>
                         <property name="image">InsertMultiIndexImg</property>
@@ -3966,6 +4010,7 @@
                       <object class="vcllo-SmallButton" id="InsertIndexesEntry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertIndexesEntry</property>
                         <property name="image">InsertIndexesEntryImg</property>
@@ -3989,6 +4034,7 @@
                           <object class="GtkButton" id="UpdateCurIndex">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:UpdateCurIndex</property>
                             <property name="relief">none</property>
@@ -4005,6 +4051,7 @@
                           <object class="GtkButton" id="UpdateAllIndexes">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:UpdateAllIndexes</property>
                             <property name="relief">none</property>
@@ -4053,6 +4100,7 @@
                       <object class="vcllo-SmallButton" id="InsertFootnote">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertFootnote</property>
                         <property name="image">InsertFootnoteImg</property>
@@ -4088,6 +4136,7 @@
                           <object class="GtkButton" id="InsertEndnote1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertEndnote</property>
                             <property name="relief">none</property>
@@ -4104,6 +4153,7 @@
                           <object class="GtkButton" id="InsertFootnoteDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertFootnoteDialog</property>
                             <property name="relief">none</property>
@@ -4158,6 +4208,7 @@
                           <object class="GtkButton" id="BibliographyComponent">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:BibliographyComponent</property>
                             <property name="image">BibliographyComponentImg</property>
@@ -4213,6 +4264,7 @@
                           <object class="vcllo-SmallButton" id="InsertCaptionDialog1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertCaptionDialog</property>
                             <property name="relief">none</property>
@@ -4257,6 +4309,7 @@
                           <object class="GtkButton" id="InsertAuthoritiesEntry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertAuthoritiesEntry</property>
                             <property name="relief">none</property>
@@ -4273,6 +4326,7 @@
                           <object class="GtkButton" id="InsertReferenceField">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertReferenceField</property>
                             <property name="relief">none</property>
@@ -4327,6 +4381,7 @@
                   <object class="vcllo-SmallButton" id="SpellingAndGrammarDialog">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:SpellingAndGrammarDialog</property>
                     <property name="image">SpellingAndGrammarDialogImg</property>
@@ -4348,6 +4403,7 @@
                       <object class="vcllo-SmallButton" id="SpellOnline">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:SpellOnline</property>
                         <property name="image">SpellOnlineImg</property>
@@ -4383,6 +4439,7 @@
                           <object class="vcllo-SmallButton" id="ThesaurusDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ThesaurusDialog</property>
                             <property name="image">ThesaurusDialogImg</property>
@@ -4400,6 +4457,7 @@
                           <object class="GtkButton" id="WordCountDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:WordCountDialog</property>
                             <property name="image">PlaceholderImg</property>
@@ -4455,6 +4513,7 @@
                           <object class="vcllo-SmallButton" id="InsertAnnotation">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertAnnotation</property>
                             <property name="image">ShowAnnotationsImg</property>
@@ -4506,6 +4565,7 @@
                       <object class="vcllo-SmallButton" id="TrackChanges">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:TrackChanges</property>
                         <property name="image">TrackChangesImg</property>
@@ -4523,6 +4583,7 @@
                       <object class="vcllo-SmallButton" id="AcceptTrackedChanges">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:AcceptTrackedChanges</property>
                         <property name="image">AcceptTrackedChangesImg</property>
@@ -4558,6 +4619,7 @@
                           <object class="GtkButton" id="ShowTrackedChanges">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ShowTrackedChanges</property>
                             <property name="relief">none</property>
@@ -4574,6 +4636,7 @@
                           <object class="GtkButton" id="CommentChangeTracking">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:CommentChangeTracking</property>
                             <property name="relief">none</property>
@@ -4619,6 +4682,7 @@
                           <object class="GtkButton" id="AcceptTrackedChange">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:AcceptTrackedChange</property>
                             <property name="relief">none</property>
@@ -4635,6 +4699,7 @@
                           <object class="GtkButton" id="RejectTrackedChange">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:RejectTrackedChange</property>
                             <property name="relief">none</property>
@@ -4680,6 +4745,7 @@
                           <object class="GtkButton" id="NextTrackedChange">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:NextTrackedChange</property>
                             <property name="relief">none</property>
@@ -4696,6 +4762,7 @@
                           <object class="GtkButton" id="PreviousTrackedChange">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:PreviousTrackedChange</property>
                             <property name="relief">none</property>
@@ -4750,6 +4817,7 @@
                           <object class="vcllo-SmallButton" id="CompareDocuments">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:CompareDocuments</property>
                             <property name="image">CompareDocumentsImg</property>
@@ -4767,6 +4835,7 @@
                           <object class="GtkButton" id="MergeDocuments">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:MergeDocuments</property>
                             <property name="image">MergeDocumentsImg</property>
@@ -4831,6 +4900,7 @@
                           <object class="GtkButton" id="PrintLayout">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:PrintLayout</property>
                             <property name="image">PrintLayoutImg</property>
@@ -4848,6 +4918,7 @@
                           <object class="GtkButton" id="BrowseView">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:BrowseView</property>
                             <property name="image">BrowseViewImg</property>
@@ -4865,6 +4936,7 @@
                           <object class="vcllo-SmallButton" id="PrintPreview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:PrintPreview</property>
                             <property name="image">PrintPreviewImg</property>
@@ -4882,6 +4954,7 @@
                           <object class="GtkButton" id="HideWhitespace">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:HideWhitespace</property>
                             <property name="image">PlaceholderImg1</property>
@@ -4944,6 +5017,7 @@
                               <object class="GtkButton" id="Ruler">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:Ruler</property>
                                 <property name="relief">none</property>
@@ -4960,6 +5034,7 @@
                               <object class="GtkButton" id="GridVisible">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:GridVisible</property>
                                 <property name="relief">none</property>
@@ -4983,6 +5058,7 @@
                           <object class="GtkButton" id="ShowAnnotations">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ShowAnnotations</property>
                             <property name="image">ShowAnnotationsIm</property>
@@ -5038,6 +5114,7 @@
                           <object class="vcllo-SmallButton" id="Zoom">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Zoom</property>
                             <property name="image">ZoomImg</property>
@@ -5081,6 +5158,7 @@
                           <object class="vcllo-SmallButton" id="Zoom100Percent">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Zoom100Percent</property>
                             <property name="image">Zoom100PercentImg</property>
@@ -5098,6 +5176,7 @@
                           <object class="vcllo-SmallButton" id="ZoomOptimal">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:ZoomOptimal</property>
                             <property name="image">ZoomOptimalImg</property>
@@ -5125,6 +5204,7 @@
                                   <object class="GtkButton" id="ZoomPage">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">True</property>
                                     <property name="action_name">.uno:ZoomPage</property>
                                     <property name="relief">none</property>
@@ -5141,6 +5221,7 @@
                                   <object class="GtkButton" id="ZoomPageWidth">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">True</property>
                                     <property name="action_name">.uno:ZoomPageWidth</property>
                                     <property name="relief">none</property>
@@ -5220,6 +5301,7 @@
                           <object class="GtkButton" id="TableDialog">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:TableDialog</property>
                             <property name="relief">none</property>
@@ -5235,6 +5317,7 @@
                           <object class="GtkButton" id="AutoFormat">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:AutoFormat</property>
                             <property name="relief">none</property>
@@ -5271,6 +5354,7 @@
                       <object class="vcllo-SmallButton" id="InsertCaptionDialog">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:InsertCaptionDialog</property>
                         <property name="image">InsertCaptionDialogImg</property>
@@ -5320,6 +5404,7 @@
                           <object class="GtkButton" id="SplitTable1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SplitTable</property>
                             <property name="relief">none</property>
@@ -5335,6 +5420,7 @@
                           <object class="GtkButton" id="DeleteTable1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DeleteTable</property>
                             <property name="relief">none</property>
@@ -5381,6 +5467,7 @@
                               <object class="GtkButton" id="InsertRowsAfter">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertRowsAfter</property>
                                 <property name="relief">none</property>
@@ -5397,6 +5484,7 @@
                               <object class="GtkButton" id="InsertRowsBefore">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertRowsBefore</property>
                                 <property name="relief">none</property>
@@ -5424,6 +5512,7 @@
                               <object class="GtkButton" id="InsertColumnsBefore">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertColumnsBefore</property>
                                 <property name="relief">none</property>
@@ -5439,6 +5528,7 @@
                               <object class="GtkButton" id="InsertColumnsAfter">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertColumnsAfter</property>
                                 <property name="relief">none</property>
@@ -5466,6 +5556,7 @@
                               <object class="GtkButton" id="DeleteRows1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:DeleteRows</property>
                                 <property name="relief">none</property>
@@ -5481,6 +5572,7 @@
                               <object class="GtkButton" id="DeleteColumns1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:DeleteColumns</property>
                                 <property name="relief">none</property>
@@ -5544,6 +5636,7 @@
                           <object class="GtkButton" id="MergeCells">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:MergeCells</property>
                             <property name="relief">none</property>
@@ -5559,6 +5652,7 @@
                           <object class="GtkButton" id="SplitCell">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:SplitCell</property>
                             <property name="relief">none</property>
@@ -5602,6 +5696,7 @@
                           <object class="GtkButton" id="Protect">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:Protect</property>
                             <property name="relief">none</property>
@@ -5617,6 +5712,7 @@
                           <object class="GtkButton" id="UnsetCellsReadOnly">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:UnsetCellsReadOnly</property>
                             <property name="relief">none</property>
@@ -5649,6 +5745,7 @@
                   <object class="vcllo-SmallButton" id="TableSort">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:TableSort</property>
                     <property name="image">TableSortImg</property>
@@ -5681,6 +5778,7 @@
                               <object class="GtkButton" id="AutoSum">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:AutoSum</property>
                                 <property name="relief">none</property>
@@ -5696,6 +5794,7 @@
                               <object class="GtkButton" id="InsertFormula">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="action_name">.uno:InsertFormula</property>
                                 <property name="relief">none</property>
@@ -5891,6 +5990,7 @@
                         <property name="label" translatable="yes" context="notebookbar|GraphicDialog">Properties</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:GraphicDialog</property>
                         <property name="image">GraphicDialogImg</property>
@@ -5924,6 +6024,7 @@
                         <property name="label" translatable="yes" context="notebookbar|Crop1">Crop</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Crop</property>
                         <property name="image">CropImp</property>
@@ -6573,6 +6674,7 @@
                     <property name="label" translatable="yes" context="notebookbar|LineFormat">Line</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:FormatLine</property>
                     <property name="image">FormatLineImg</property>
@@ -6591,6 +6693,7 @@
                     <property name="label" translatable="yes" context="notebookbar|AreaFormat">Area</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:FormatArea</property>
                     <property name="image">FormatAreaImg</property>
@@ -6696,6 +6799,7 @@
                   <object class="vcllo-SmallButton" id="ToggleObjectRotateMode">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
                     <property name="image">ToggleObjectRotateModeImg</property>
@@ -6782,6 +6886,7 @@
                   <object class="vcllo-SmallButton" id="WrapOff">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:WrapOff</property>
                     <property name="image">WrapOffImg</property>
@@ -6799,6 +6904,7 @@
                   <object class="vcllo-SmallButton" id="WrapOn">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:WrapOn</property>
                     <property name="image">WrapOnImg</property>
@@ -6816,6 +6922,7 @@
                   <object class="vcllo-SmallButton" id="WrapOptimal">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:WrapIdeal</property>
                     <property name="image">WrapIdealImg</property>
@@ -6833,6 +6940,7 @@
                   <object class="vcllo-SmallButton" id="WrapLeft">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:WrapLeft</property>
                     <property name="image">WrapLeftImg</property>
@@ -6850,6 +6958,7 @@
                   <object class="vcllo-SmallButton" id="WrapRight">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:WrapRight</property>
                     <property name="image">WrapRightImg</property>
@@ -6867,6 +6976,7 @@
                   <object class="vcllo-SmallButton" id="WrapThrough">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:WrapThrough</property>
                     <property name="image">WrapThroughImg</property>
@@ -7116,6 +7226,7 @@
                   <object class="vcllo-SmallButton" id="BringToFront">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:BringToFront</property>
                     <property name="image">BringToFrontImg</property>
@@ -7133,6 +7244,7 @@
                   <object class="vcllo-SmallButton" id="SendToBack">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:SendToBack</property>
                     <property name="image">SendToBackImg</property>
@@ -7222,6 +7334,7 @@
                       <object class="GtkButton" id="ObjectForwardOneB">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ObjectForwardOne</property>
                         <property name="relief">none</property>
@@ -7237,6 +7350,7 @@
                       <object class="GtkButton" id="ObjectBackOneB">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:ObjectBackOne</property>
                         <property name="relief">none</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 8662843687a9..0dd3b97e0dd6 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -2380,6 +2380,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|fileb">_File</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -3142,6 +3143,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|menub">_Menu</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -4241,6 +4243,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|insertb">_Insert</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -4920,6 +4923,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|reviewb">Pag_e</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -5454,6 +5458,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|referenceb">Reference_s</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="relief">none</property>
@@ -6340,6 +6345,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|reviewR">_Review</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -6841,6 +6847,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|viewb">_View</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -6940,6 +6947,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|tableT">T_able</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="relief">none</property>
@@ -8028,6 +8036,7 @@
                             <property name="label" translatable="yes" context="notebookbar_compact|wrapb">Wrap</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -8141,6 +8150,7 @@
                             <property name="label" translatable="yes" context="notebookbar_compact|graphicB">A_lign</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="relief">none</property>
@@ -8422,6 +8432,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|graphicB">_Graphic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="relief">none</property>
@@ -8858,6 +8869,7 @@
                             <property name="label" translatable="yes" context="notebookbar_compact|wrapb">Wrap</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -8971,6 +8983,7 @@
                             <property name="label" translatable="yes" context="notebookbar_compact|graphicB">A_lign</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="relief">none</property>
@@ -9198,6 +9211,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|drab">D_raw</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -9526,6 +9540,7 @@
                             <property name="label" translatable="yes" context="notebookbar_compact|wrapb">Wrap</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -9639,6 +9654,7 @@
                             <property name="label" translatable="yes" context="notebookbar_compact|graphicB">A_lign</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="relief">none</property>
@@ -9776,6 +9792,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|frame:MenuDraw">Object</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -9881,6 +9898,7 @@
                         <property name="label" translatable="yes" context="notebookbar_compact|referenceb">_Tools</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">False</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 54f7299a41cd..61d10775943d 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -4006,6 +4006,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -4061,6 +4062,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
@@ -4149,6 +4151,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -4303,6 +4306,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -4441,6 +4445,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -4618,6 +4623,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatb">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -4867,6 +4873,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5038,6 +5045,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
@@ -5185,6 +5193,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|referenceb">Reference_s</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="valign">center</property>
                                 <property name="vexpand">True</property>
@@ -5291,6 +5300,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="valign">center</property>
                                     <property name="vexpand">True</property>
@@ -5404,6 +5414,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5507,6 +5518,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5685,6 +5697,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatt">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -5900,6 +5913,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6028,6 +6042,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|tableT">T_able</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -6167,6 +6182,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|merged">_Merge</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6292,6 +6308,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">R_ows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6420,6 +6437,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|selectt">Selec_t</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6534,6 +6552,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|calculatet">_Calc</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6672,6 +6691,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -6787,6 +6807,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7110,6 +7131,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrange">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7273,6 +7295,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7396,6 +7419,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|languageb">_Language</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -7525,6 +7549,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|revieb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7662,6 +7687,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|commentsb">_Comments</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -7762,6 +7788,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|compareb">Com_pare</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -7865,6 +7892,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewA">_View</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -8052,6 +8080,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8268,6 +8297,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawb">D_raw</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8498,6 +8528,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeD">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8637,6 +8668,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Grid">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8749,6 +8781,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -8860,6 +8893,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9046,6 +9080,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">F_rame</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -9253,6 +9288,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeO">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9365,6 +9401,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridO">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9478,6 +9515,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewO">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9586,6 +9624,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -9764,6 +9803,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formats">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -10025,6 +10065,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphs">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
@@ -10187,6 +10228,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewc">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 61b2bba98653..89c5c5716f65 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -3934,6 +3934,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -3986,6 +3987,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -4040,6 +4042,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_Help</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="relief">none</property>
                                 <property name="use_underline">True</property>
@@ -4147,6 +4150,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|fileb">_File</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -4384,6 +4388,7 @@
                                 <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
                                 <property name="receives_default">False</property>
                                 <property name="halign">start</property>
                                 <property name="relief">none</property>
@@ -4580,6 +4585,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstyleb">St_yles</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -4867,6 +4873,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatb">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5218,6 +5225,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphb">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5457,6 +5465,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertb">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5685,6 +5694,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|referenceb">Referen_ce</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -5886,6 +5896,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6035,6 +6046,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6296,6 +6308,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6726,6 +6739,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrange">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -6902,6 +6916,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -7156,6 +7171,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7333,6 +7349,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">St_yles</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7620,6 +7637,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatt">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -7971,6 +7989,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragrapht">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8198,6 +8217,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|tabled">T_able</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8396,6 +8416,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|rowscolumnst">R_ows</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8597,6 +8618,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|merged">_Merge</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -8825,6 +8847,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|selectt">Sele_ct</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9054,6 +9077,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|calculatet">_Calc</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9282,6 +9306,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|referencet">Referen_ce</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9418,6 +9443,7 @@
                                     <property name="label" translatable="yes" context="notebookbar_groupedbar_full|languageb">_Language</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="halign">start</property>
                                     <property name="relief">none</property>
@@ -9646,6 +9672,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|revieb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -9858,6 +9885,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|commentsb">_Comments</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10060,6 +10088,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|compareb">Com_pare</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10209,6 +10238,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewa">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -10654,6 +10684,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawb">D_raw</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11024,6 +11055,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">_Edit</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11254,6 +11286,7 @@
                                             <property name="label" translatable="yes" context="notebookbar_groupedbar_full|wrapb">Wrap</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
                                             <property name="receives_default">False</property>
                                             <property name="relief">none</property>
                                           </object>
@@ -11268,6 +11301,7 @@
                                             <property name="label" translatable="yes" context="notebookbar_groupedbar_full|alignb">Align</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
                                             <property name="receives_default">False</property>
                                             <property name="relief">none</property>
                                           </object>
@@ -11300,6 +11334,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11467,6 +11502,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11668,6 +11704,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewDrawb">Grou_p</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -11847,6 +11884,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|3Db">3_D</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12158,6 +12196,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12424,6 +12463,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12600,6 +12640,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewd">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -12753,6 +12794,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextb">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -13186,6 +13228,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|media">_Media</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -13423,6 +13466,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|oleB">F_rame</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -13853,6 +13897,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrageOLE">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -14019,6 +14064,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|OleGridB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
@@ -14168,6 +14214,7 @@
                                         <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewf">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
                                         <property name="receives_default">False</property>
                                         <property name="halign">start</property>
                                         <property name="relief">none</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index 1834d35de197..462672af6888 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -586,6 +586,7 @@
                       <object class="GtkButton" id="newb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -605,6 +606,7 @@
                       <object class="GtkButton" id="openb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -637,6 +639,7 @@
                         <property name="width_request">60</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="vexpand">True</property>
                         <property name="action_name">.uno:Save</property>
@@ -668,6 +671,7 @@
                       <object class="GtkButton" id="pdfb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -687,6 +691,7 @@
                       <object class="GtkButton" id="printb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -789,6 +794,7 @@
                         <property name="width_request">70</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="halign">start</property>
                         <property name="vexpand">True</property>
@@ -821,6 +827,7 @@
                       <object class="GtkButton" id="redob">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -840,6 +847,7 @@
                       <object class="GtkButton" id="undob">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -936,6 +944,7 @@
                     <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">.uno:DesignerDialog</property>
                     <property name="image">paragraphstylei</property>
@@ -1098,6 +1107,7 @@
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
@@ -1120,6 +1130,7 @@
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="halign">end</property>
                             <property name="valign">center</property>
@@ -1159,11 +1170,11 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:LeftPara</property>
                         <property name="image">lefti</property>
                         <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -1177,6 +1188,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:CenterPara</property>
                         <property name="image">centeri</property>
@@ -1194,6 +1206,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:RightPara</property>
                         <property name="image">righti</property>
@@ -1224,11 +1237,11 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Bold</property>
                         <property name="image">boldi</property>
                         <property name="relief">none</property>
-                        <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -1242,6 +1255,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Italic</property>
                         <property name="image">italicsi</property>
@@ -1259,6 +1273,7 @@
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="action_name">.uno:Underline</property>
                         <property name="relief">none</property>
@@ -1382,6 +1397,7 @@
                       <object class="GtkButton" id="bulletsb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -1400,6 +1416,7 @@
                       <object class="GtkButton" id="numberingb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="valign">center</property>
                         <property name="vexpand">True</property>
@@ -1529,6 +1546,7 @@
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertGraphic</property>
                             <property name="relief">none</property>
@@ -1545,6 +1563,7 @@
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:DrawText</property>
                             <property name="relief">none</property>
@@ -1574,6 +1593,7 @@
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="image">linksi</property>
                             <property name="relief">none</property>
@@ -1590,6 +1610,7 @@
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertAnnotation</property>
                             <property name="relief">none</property>
@@ -1645,6 +1666,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertObjectChart</property>
                             <property name="relief">none</property>
@@ -1661,6 +1683,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertObjectStarMath</property>
                             <property name="relief">none</property>
@@ -1677,6 +1700,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:TrackChanges</property>
                             <property name="relief">none</property>
@@ -1760,6 +1784,7 @@
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="image">tablestylei</property>
                         <property name="relief">none</property>
@@ -1780,6 +1805,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|tablerowsb">Rows</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1798,6 +1824,7 @@
                             <property name="label" translatable="yes" context="notebookbar_groups|tablecolumnsb">Columns</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -1925,6 +1952,7 @@
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:CellVertTop</property>
                             <property name="relief">none</property>
@@ -1941,6 +1969,7 @@
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:CellVertCenter</property>
                             <property name="relief">none</property>
@@ -1957,6 +1986,7 @@
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:CellVertBottom</property>
                             <property name="relief">none</property>
@@ -2040,6 +2070,7 @@
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
                         <property name="image">paragraphstylei</property>
                         <property name="relief">none</property>
@@ -2061,6 +2092,7 @@
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -2080,6 +2112,7 @@
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -2110,6 +2143,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertCaptionDialog</property>
                             <property name="relief">none</property>
@@ -2127,6 +2161,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="image">wrapi</property>
                             <property name="relief">none</property>
@@ -2144,6 +2179,7 @@
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
                             <property name="receives_default">True</property>
                             <property name="image">locki</property>
                             <property name="relief">none</property>
author	Maxim Monastirsky <momonasmon@gmail.com>	2018-01-19 03:39:44 +0200
committer	Maxim Monastirsky <momonasmon@gmail.com>	2018-01-20 22:50:00 +0100
commit	5f650f72861d94c7c173bc16de9331c3c1c305d5 (patch)
tree	1b2de68f129017dc77bb097fd8f8434d5d0015db
parent	2a2b37202a735b34da914c03b2f6e1495f833b51 (diff)