diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp
index 25bf2ebd..eef42706 100644
--- a/cockatrice/src/gameselector.cpp
+++ b/cockatrice/src/gameselector.cpp
@@ -76,6 +76,8 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
 
     connect(joinButton, SIGNAL(clicked()), this, SLOT(actJoin()));
     connect(spectateButton, SIGNAL(clicked()), this, SLOT(actJoin()));
+    connect(gameListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(actJoin()));
+    connect(gameListView, SIGNAL(activated(const QModelIndex &)), this, SLOT(actJoin()));
 }
 
 void GameSelector::actSetFilter()
diff --git a/cockatrice/src/tab_server.cpp b/cockatrice/src/tab_server.cpp
index b82248a3..4fba193b 100644
--- a/cockatrice/src/tab_server.cpp
+++ b/cockatrice/src/tab_server.cpp
@@ -52,6 +52,8 @@ RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent)
     setLayout(vbox);
     
     connect(client, SIGNAL(listRoomsEventReceived(const Event_ListRooms &)), this, SLOT(processListRoomsEvent(const Event_ListRooms &)));
+    connect(roomList, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(joinClicked()));
+    connect(roomList, SIGNAL(activated(const QModelIndex &)), this, SLOT(joinClicked()));
     client->sendCommand(client->prepareSessionCommand(Command_ListRooms()));
 }