diff --git a/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp b/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
index c1d7230553..41d8e6c98b 100644
--- a/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
+++ b/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
@@ -212,8 +212,9 @@ DENG_GUI_PIMPL(GamePanelButtonWidget)
             //ClientWindow::main().taskBar().close();
             // TODO: Emit a signal that hides the Home and closes the taskbar.
 
-            // Switch the game.
             gameProfile.setLastPlayedAt();
+
+            // Switch the game.
             DoomsdayApp::app().changeGame(gameProfile, DD_ActivateGameWorker);
 
             if (saves->selectedPos() != ui::Data::InvalidPos)
diff --git a/doomsday/apps/client/src/ui/home/homewidget.cpp b/doomsday/apps/client/src/ui/home/homewidget.cpp
index 647462c514..2d827d311b 100644
--- a/doomsday/apps/client/src/ui/home/homewidget.cpp
+++ b/doomsday/apps/client/src/ui/home/homewidget.cpp
@@ -498,16 +498,16 @@ DENG_GUI_PIMPL(HomeWidget)
         }
 
         // Remove the highlight.
+        const int newHighlightPos = tabs->currentItem().data().toInt();
         for (int pos = 0; pos < columns.size(); ++pos)
         {
-            if (columns[pos]->isHighlighted())
+            if (pos != newHighlightPos && columns[pos]->isHighlighted())
             {
                 columns[pos]->setHighlighted(false);
             }
         }
-
         // Set new highlight.
-        columns[tabs->currentItem().data().toInt()]->setHighlighted(true);
+        columns[newHighlightPos]->setHighlighted(true);
 
         moveShowTimer.start();
     }