diff --git a/src/drivers/Qt/ConsoleDebugger.cpp b/src/drivers/Qt/ConsoleDebugger.cpp
index 53470188..970ab2df 100644
--- a/src/drivers/Qt/ConsoleDebugger.cpp
+++ b/src/drivers/Qt/ConsoleDebugger.cpp
@@ -699,6 +699,8 @@ void ConsoleDebugger::openBpEditWindow( int editIdx, watchpointinfo *wp )
    connect(     okButton, SIGNAL(clicked(void)), &dialog, SLOT(accept(void)) );
    connect( cancelButton, SIGNAL(clicked(void)), &dialog, SLOT(reject(void)) );
 
+	okButton->setDefault(true);
+
 	if ( wp != NULL )
 	{
 		char stmp[256];
@@ -944,6 +946,8 @@ void ConsoleDebugger::openDebugSymbolEditWindow( int addr )
 	connect(     okButton, SIGNAL(clicked(void)), &dialog, SLOT(accept(void)) );
    connect( cancelButton, SIGNAL(clicked(void)), &dialog, SLOT(reject(void)) );
 
+	okButton->setDefault(true);
+
 	if ( sym != NULL )
 	{
 		nameEntry->setText( tr(sym->name.c_str()) );
diff --git a/src/drivers/Qt/HexEditor.cpp b/src/drivers/Qt/HexEditor.cpp
index d9663e12..2f7be30f 100644
--- a/src/drivers/Qt/HexEditor.cpp
+++ b/src/drivers/Qt/HexEditor.cpp
@@ -1079,6 +1079,8 @@ void HexEditorDialog_t::openDebugSymbolEditWindow( int addr )
 	connect(     okButton, SIGNAL(clicked(void)), &dialog, SLOT(accept(void)) );
    connect( cancelButton, SIGNAL(clicked(void)), &dialog, SLOT(reject(void)) );
 
+	okButton->setDefault(true);
+
 	if ( sym != NULL )
 	{
 		nameEntry->setText( tr(sym->name.c_str()) );