3 files changed, 3 insertions, 8 deletions
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 56ce13f12c3a..48819345fa55 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -137,7 +137,10 @@ bool WeldEditView::MouseButtonDown(const MouseEvent& rMEvt)
         CaptureMouse();
 
     if (!HasFocus())
+    {
         GrabFocus();
+        GetFocus();
+    }
 
     return m_xEditView && m_xEditView->MouseButtonDown(rMEvt);
 }
diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx
index 3e5de483c91a..982b70f69b59 100644
--- a/svx/source/inc/findtextfield.hxx
+++ b/svx/source/inc/findtextfield.hxx
@@ -37,8 +37,6 @@ public:
 
     virtual ~FindTextFieldControl() override;
 
-    virtual void GetFocus() override;
-
     void Remember_Impl(const OUString& rStr);
     void SetTextToSelected_Impl();
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index a1860eea7126..76c7d3f294be 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -405,12 +405,6 @@ void FindTextFieldControl::set_entry_message_type(weld::EntryMessageType eType)
     m_xWidget->set_entry_message_type(eType);
 }
 
-void FindTextFieldControl::GetFocus()
-{
-    InterimItemWindow::GetFocus();
-    FocusIn();
-}
-
 namespace {
 
 class SearchToolbarControllersManager