diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua
index 89fc096..3c92883 100644
--- a/PHI-CL/control.lua
+++ b/PHI-CL/control.lua
@@ -1,10 +1,10 @@
 local cargo_landing = require('control/cargo-landing')
 local chest = require('control/chest')
+local editor = require('control/editor')
 local infinity_container = require('control/infinity-container')
 local inserter = require('control/inserter')
 local pump = require('control/pump')
 local rail_support = require('control/rail-support')
-local shortcut = require('control/shortcut')
 local trash = require('control/trash')
 
 local function entity_build(event)
@@ -19,6 +19,11 @@ local function entity_destroy(event)
     rail_support.destroy(event)
 end
 
+local function shortcut_button_toggle(event)
+    calculator.toggle(event)
+    editor.toggle(event)
+end
+
 if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].value) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then
     script.on_event({defines.events.on_player_cheat_mode_enabled, defines.events.on_player_cheat_mode_disabled}, pump.recipe_hidden)
 end
@@ -118,6 +123,6 @@ if settings.startup['PHI-MI'].value or (settings.startup['PHI-GM'].value and set
 end
 
 if settings.startup['PHI-CT'].value then
-    script.on_event(defines.events.on_lua_shortcut, shortcut.toggle)
-    script.on_event(defines.events.on_player_toggled_map_editor, shortcut.after_toggle)
+    script.on_event(defines.events.on_lua_shortcut, shortcut_button_toggle)
+    script.on_event(defines.events.on_player_toggled_map_editor, editor.toggle_editor)
 end
diff --git a/PHI-CL/control/shortcut.lua b/PHI-CL/control/editor.lua
similarity index 94%
rename from PHI-CL/control/shortcut.lua
rename to PHI-CL/control/editor.lua
index 8b7c5b2..39f79df 100644
--- a/PHI-CL/control/shortcut.lua
+++ b/PHI-CL/control/editor.lua
@@ -18,7 +18,7 @@ function main.toggle(event)
     player.toggle_map_editor()
 end
 
-function main.after_toggle(event)
+function main.toggle_editor(event)
     local player = game.players[event.player_index]
     player.set_shortcut_toggled('phi-cl-toggle-editor', player.physical_controller_type == defines.controllers.editor)
     game.tick_paused = false