diff --git a/resources/lib/dialogs/serverconnect.py b/resources/lib/dialogs/serverconnect.py
index 8a39b09b..541ca6f9 100644
--- a/resources/lib/dialogs/serverconnect.py
+++ b/resources/lib/dialogs/serverconnect.py
@@ -85,7 +85,8 @@ class ServerConnect(xbmcgui.WindowXMLDialog):
         if not self.emby_connect: # Change connect user
             self.getControl(EMBY_CONNECT).setLabel("[UPPERCASE][B]"+lang(30618)+"[/B][/UPPERCASE]")
 
-        self.setFocus(self.list_)
+        if self.servers:
+            self.setFocus(self.list_)
 
     @classmethod
     def _add_listitem(cls, label, server_id, server_type):
diff --git a/resources/skins/default/1080i/script-emby-connect-server.xml b/resources/skins/default/1080i/script-emby-connect-server.xml
index 01fc9141..bc751e8c 100644
--- a/resources/skins/default/1080i/script-emby-connect-server.xml
+++ b/resources/skins/default/1080i/script-emby-connect-server.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol always="true">155</defaultcontrol>
+	<defaultcontrol always="true">205</defaultcontrol>
 	<zorder>0</zorder>
 	<include>dialogeffect</include>
 	<controls>