diff --git a/app/gui/appmodel.cpp b/app/gui/appmodel.cpp
index 2325ba84..23e48115 100644
--- a/app/gui/appmodel.cpp
+++ b/app/gui/appmodel.cpp
@@ -101,12 +101,26 @@ void AppModel::quitRunningApp()
     m_ComputerManager->quitRunningApp(m_Computer);
 }
 
+bool AppModel::isAppCurrentlyVisible(const NvApp& app)
+{
+    for (const NvApp& visibleApp : m_VisibleApps) {
+        if (app.id == visibleApp.id) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 QVector<NvApp> AppModel::getVisibleApps(const QVector<NvApp>& appList)
 {
     QVector<NvApp> visibleApps;
 
     for (const NvApp& app : appList) {
-        if (m_ShowHiddenGames || !app.hidden) {
+        // Don't immediately hide games that were previously visible. This
+        // allows users to easily uncheck the "Hide App" checkbox if they
+        // check it by mistake.
+        if (m_ShowHiddenGames || !app.hidden || isAppCurrentlyVisible(app)) {
             visibleApps.append(app);
         }
     }
diff --git a/app/gui/appmodel.h b/app/gui/appmodel.h
index a69abd7a..bf072361 100644
--- a/app/gui/appmodel.h
+++ b/app/gui/appmodel.h
@@ -54,6 +54,8 @@ private:
 
     QVector<NvApp> getVisibleApps(const QVector<NvApp>& appList);
 
+    bool isAppCurrentlyVisible(const NvApp& app);
+
     NvComputer* m_Computer;
     BoxArtManager m_BoxArtManager;
     ComputerManager* m_ComputerManager;