diff --git a/install/input.xml b/install/input.xml
index b2c754ebd..a8a2f5ce5 100644
--- a/install/input.xml
+++ b/install/input.xml
@@ -231,5 +231,8 @@
         <commandRemapping oldname="TextureTool" newname="ToggleTextureTool" />
         <commandRemapping oldname="GameConnectionDialogToggle" newname="ToggleGameConnectionPanel" />
         <commandRemapping oldname="ViewTextures" newname="ToggleTextureBrowser" />
+        <!-- DR 3.6.0: Re-bind the old FocusCameraOnSelection shortcut to ToggleSelectionFocus  -->
+        <!-- FocusCameraOnSelection is now called FocusCameraViewOnSelection -->
+        <commandRemapping oldname="FocusCameraOnSelection" newname="ToggleSelectionFocus" />
 	</commandRemappings>
 </input>
diff --git a/radiantcore/map/Map.cpp b/radiantcore/map/Map.cpp
index 0e9145a98..a536caae8 100644
--- a/radiantcore/map/Map.cpp
+++ b/radiantcore/map/Map.cpp
@@ -1014,7 +1014,7 @@ void Map::registerCommands()
     GlobalCommandSystem().addCommand("ExportMap", std::bind(&Map::exportMap, this, std::placeholders::_1));
     GlobalCommandSystem().addCommand("SaveSelected", Map::exportSelection);
     GlobalCommandSystem().addCommand("FocusViews", std::bind(&Map::focusViewCmd, this, std::placeholders::_1), { cmd::ARGTYPE_VECTOR3, cmd::ARGTYPE_VECTOR3 });
-    GlobalCommandSystem().addCommand("FocusCameraOnSelection", std::bind(&Map::focusCameraOnSelectionCmd, this, std::placeholders::_1));
+    GlobalCommandSystem().addCommand("FocusCameraViewOnSelection", std::bind(&Map::focusCameraOnSelectionCmd, this, std::placeholders::_1));
     // ExportSelectedAsModel <Path> <ExportFormat> [<ExportOrigin>] [<OriginEntityName>] [<CustomOrigin>] [<SkipCaulk>] [<ReplaceSelectionWithModel>] [<ExportLightsAsObjects>]
 	GlobalCommandSystem().addCommand("ExportSelectedAsModel", algorithm::exportSelectedAsModelCmd,
         { cmd::ARGTYPE_STRING, // path