diff --git a/src/gui/qt/joinnetworkgamedialog.ui b/src/gui/qt/joinnetworkgamedialog.ui
index b38c8d8b..c04ae23d 100644
--- a/src/gui/qt/joinnetworkgamedialog.ui
+++ b/src/gui/qt/joinnetworkgamedialog.ui
@@ -219,6 +219,18 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>lineEdit_ipAddress</tabstop>
+  <tabstop>lineEdit_password</tabstop>
+  <tabstop>lineEdit_3</tabstop>
+  <tabstop>spinBox_port</tabstop>
+  <tabstop>checkBox_ipv6</tabstop>
+  <tabstop>treeWidget</tabstop>
+  <tabstop>pushButton_2</tabstop>
+  <tabstop>pushButton_5</tabstop>
+  <tabstop>pushButton_connect</tabstop>
+  <tabstop>pushButton_close</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
@@ -228,8 +240,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>79</x>
-     <y>145</y>
+     <x>376</x>
+     <y>447</y>
     </hint>
     <hint type="destinationlabel" >
      <x>33</x>
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index 8af417b5..e9928dad 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -27,11 +27,25 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
 
     setupUi(this);
 
+	lineEdit_ipAddress->setFocus();
+
+
+// 	QShortcut *connectKey = new QShortcut(QKeySequence(Qt::Key_Enter), this);
+// 	connect( connectKey, SIGNAL(activated() ), pushButton_connect, SLOT( click() ) );
+
 	connect( pushButton_connect, SIGNAL( clicked() ), this, SLOT( startClient() ) );
-	
+
 }
 
 void joinNetworkGameDialogImpl::startClient() {
 
 	// TODO: Check input values!
 }
+
+void joinNetworkGameDialogImpl::keyPressEvent ( QKeyEvent * event ) {
+
+// 	std::cout << "key" << event->key();
+	
+	if (event->key() == 16777220) { pushButton_connect->click(); } //ENTER 
+	
+}
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
index d423bbd8..ce2b5c07 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
@@ -36,6 +36,7 @@ public:
 public slots:
 
 	void startClient();
+	void keyPressEvent ( QKeyEvent * event );
 };
 
 #endif