diff --git a/Source/Core/DolphinQt2/Debugger/CodeWidget.cpp b/Source/Core/DolphinQt2/Debugger/CodeWidget.cpp
index 40543bf84a..27ed139a93 100644
--- a/Source/Core/DolphinQt2/Debugger/CodeWidget.cpp
+++ b/Source/Core/DolphinQt2/Debugger/CodeWidget.cpp
@@ -187,6 +187,8 @@ void CodeWidget::OnSearchAddress()
     m_code_view->SetAddress(address, CodeViewWidget::SetAddressUpdate::WithUpdate);
 
   Update();
+
+  m_search_address->setFocus();
 }
 
 void CodeWidget::OnSearchSymbols()