diff --git a/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp b/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp
index e75f618ea6..6a1a3eff7b 100644
--- a/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp
+++ b/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp
@@ -19,6 +19,7 @@
 NewBreakpointDialog::NewBreakpointDialog(BreakpointWidget* parent)
     : QDialog(parent), m_parent(parent)
 {
+  setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
   setWindowTitle(tr("New Breakpoint"));
   CreateWidgets();
   ConnectWidgets();
@@ -102,6 +103,8 @@ void NewBreakpointDialog::CreateWidgets()
   layout->addWidget(m_buttons);
 
   setLayout(layout);
+
+  m_instruction_address->setFocus();
 }
 
 void NewBreakpointDialog::ConnectWidgets()