diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index ceba1fae57..1e7223b89e 100644
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -173,6 +173,7 @@ gtk_inspector_window_init (GtkInspectorWindow *iw)
         {
           button = gtk_button_new_from_icon_name ("find-location-symbolic",
                                                   GTK_ICON_SIZE_MENU);
+          gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
           gtk_widget_set_halign (button, GTK_ALIGN_START);
           gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
           g_signal_connect (button, "clicked",
diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index 1cd1d8d3d5..366d1791a5 100644
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -20,6 +20,7 @@
                 <child>
                   <object class="GtkButton" id="select_object">
                     <property name="visible">True</property>
+                    <property name="focus-on-click">False</property>
                     <property name="tooltip-text" translatable="yes">Select an Object</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
@@ -42,6 +43,7 @@
                     <child>
                       <object class="GtkButton" id="object_details_button">
                         <property name="visible">True</property>
+                        <property name="focus-on-click">False</property>
                         <property name="tooltip-text" translatable="yes">Show Details</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
@@ -64,6 +66,7 @@
                     <child>
                       <object class="GtkButton">
                         <property name="visible">True</property>
+                        <property name="focus-on-click">False</property>
                         <property name="tooltip-text" translatable="yes">Show all Objects</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
@@ -93,6 +96,7 @@
             <child>
               <object class="GtkToggleButton" id="record_statistics_button">
                 <property name="visible">True</property>
+                <property name="focus-on-click">False</property>
                 <property name="tooltip-text" translatable="yes">Collect Statistics</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
@@ -119,6 +123,7 @@
                 <child>
                   <object class="GtkButton">
                     <property name="visible">True</property>
+                    <property name="focus-on-click">False</property>
                     <property name="tooltip-text" translatable="yes">Show Details</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
@@ -140,6 +145,7 @@
                 <child>
                   <object class="GtkButton">
                     <property name="visible">True</property>
+                    <property name="focus-on-click">False</property>
                     <property name="tooltip-text" translatable="yes">Show all Resources</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>