diff --git a/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm b/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm
index 4fb988fc2..d9c246285 100644
--- a/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm
+++ b/desmume/src/frontend/cocoa/userinterface/inputPrefsView.mm
@@ -324,15 +324,7 @@
 		[inputPrefOutlineView deselectRow:rowNumber];
 	}
 	
-	// Update all expanded command tags.
-	for (NSString *tag in inputMappings)
-	{
-		NSArray *inputList = (NSArray *)[inputMappings valueForKey:tag];
-		if ([inputPrefOutlineView isItemExpanded:inputList])
-		{
-			[inputPrefOutlineView reloadItem:inputList reloadChildren:YES];
-		}
-	}
+	[inputPrefOutlineView reloadItem:nil reloadChildren:YES];
 	
 	[self setConfigInputTargetID:nil];
 	
@@ -793,7 +785,7 @@
 	[inputManager removeMappingUsingDeviceCode:[(NSString *)[deviceInfo valueForKey:@"deviceCode"] cStringUsingEncoding:NSUTF8StringEncoding] elementCode:[(NSString *)[deviceInfo valueForKey:@"elementCode"] cStringUsingEncoding:NSUTF8StringEncoding]];
 	[inputManager writeDefaultsInputMappings];
 	
-	[outlineView reloadItem:inputList reloadChildren:YES];
+	[outlineView reloadItem:nil reloadChildren:YES];
 	
 	// If we're dealing with a Microphone command, update the audio file generators list.
 	if ([[inputManager commandTagFromInputList:inputList] isEqualToString:@"Microphone"])