diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4795222..6294383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix an issue where `when` in conditional bindings couldn't be evaluated since v0.10.0. ([VSpaceCode/#256](https://github.com/VSpaceCode/VSpaceCode/issues/256))
+
 ## [0.11.0] - 2021-11-29
 
 ### Added
diff --git a/src/menu/baseWhichKeyMenu.ts b/src/menu/baseWhichKeyMenu.ts
index 9a006d8..cf61358 100644
--- a/src/menu/baseWhichKeyMenu.ts
+++ b/src/menu/baseWhichKeyMenu.ts
@@ -150,8 +150,8 @@ export abstract class BaseWhichKeyMenu<T extends BaseWhichKeyMenuItem> implement
         //     ],
         // }
         // ```
-        this._valueQueue.push(arg.key);
         this._when = arg.when;
+        this._valueQueue.push(arg.key);
     }
 
     private handleDidAccept(): void {