diff --git a/mptrack/CommandSet.h b/mptrack/CommandSet.h
index 000d346c7d7..2a29533df4b 100644
--- a/mptrack/CommandSet.h
+++ b/mptrack/CommandSet.h
@@ -1274,7 +1274,7 @@ class CCommandSet
 
 	// Communication
 	KeyCombination GetKey(CommandID cmd, UINT key) const { return m_commands[cmd].kcList[key]; }
-	mpt::span<const KeyCombination> GetKeyChoices(CommandID cmd) const { return m_commands[cmd].kcList; }
+	mpt::span<const KeyCombination> GetKeyChoices(CommandID cmd) const { return mpt::as_span(m_commands[cmd].kcList); }
 	bool IsHidden(UINT c) const { return m_commands[c].IsHidden(); }
 	int GetKeyListSize(CommandID cmd) const { return (cmd != kcNull) ? static_cast<int>(m_commands[cmd].kcList.size()) : 0; }
 	CString GetCommandText(CommandID cmd) const { return m_commands[cmd].Message; }