diff --git a/Delta/Settings/Controllers/ControllersSettingsViewController.swift b/Delta/Settings/Controllers/ControllersSettingsViewController.swift
index 8ea38f5..2c9169d 100644
--- a/Delta/Settings/Controllers/ControllersSettingsViewController.swift
+++ b/Delta/Settings/Controllers/ControllersSettingsViewController.swift
@@ -305,6 +305,8 @@ extension ControllersSettingsViewController
 {
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath)
     {
+        let previousGameController = self.gameController
+        
         switch Section(rawValue: indexPath.section)!
         {
         case .localDevice: self.gameController = self.localDeviceController
@@ -319,7 +321,7 @@ extension ControllersSettingsViewController
         
         let previousIndexPath: IndexPath?
         
-        if let gameController = self.gameController
+        if let gameController = previousGameController
         {
             if gameController == self.localDeviceController
             {