diff --git a/aegisub/libaegisub/common/hotkey.cpp b/aegisub/libaegisub/common/hotkey.cpp
index fe3368b52..74b3b52ca 100644
--- a/aegisub/libaegisub/common/hotkey.cpp
+++ b/aegisub/libaegisub/common/hotkey.cpp
@@ -129,9 +129,9 @@ void Hotkey::BuildHotkey(std::string context, const json::Object& object) {
 }
 
 
-bool Hotkey::Scan(const std::string &context, const std::string &str, std::string &cmd) {
-	HotkeyMap::iterator index;
-	std::pair<HotkeyMap::iterator, HotkeyMap::iterator> range;
+bool Hotkey::Scan(const std::string &context, const std::string &str, std::string &cmd) const {
+	HotkeyMap::const_iterator index;
+	std::pair<HotkeyMap::const_iterator, HotkeyMap::const_iterator> range;
 
 	range = map.equal_range(str);
 	std::string local, dfault;
diff --git a/aegisub/libaegisub/include/libaegisub/hotkey.h b/aegisub/libaegisub/include/libaegisub/hotkey.h
index 3f69168ce..b0f913152 100644
--- a/aegisub/libaegisub/include/libaegisub/hotkey.h
+++ b/aegisub/libaegisub/include/libaegisub/hotkey.h
@@ -106,7 +106,7 @@ public:
 	/// @param context  Context requested.
 	/// @param str      Hyphen separated key sequence.
 	/// @param[out] cmd Command found.
-	bool Scan(const std::string &context, const std::string &str, std::string &cmd);
+	bool Scan(const std::string &context, const std::string &str, std::string &cmd) const;
 
 private:
 	typedef std::multimap<std::string, Combo*> HotkeyMap;	///< Map to hold Combo instances.