diff --git a/src/hotkey_handler.cpp b/src/hotkey_handler.cpp
index 7c7ad540e2f9..b845de8173f8 100644
--- a/src/hotkey_handler.cpp
+++ b/src/hotkey_handler.cpp
@@ -460,8 +460,8 @@ bool play_controller::hotkey_handler::in_context_menu(hotkey::HOTKEY_COMMAND com
 
 		// A quick check to save us having to create the future map and
 		// possibly loop through all units.
-		if ( !gamestate_.board_.map().is_keep(last_hex)  &&
-		     !gamestate_.board_.map().is_castle(last_hex) )
+		if ( !play_controller_.get_map_const().is_keep(last_hex)  &&
+		     !play_controller_.get_map_const().is_castle(last_hex) )
 			return false;
 
 		wb::future_map future; /* lasts until method returns. */