diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
index a78b0055..d5662a6a 100644
--- a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
+++ b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
@@ -237,11 +237,11 @@ extension KeyHandler {
       return true
     }
 
-    // MARK: Calling candidate window using Space or Down or PageUp / PageDn.
+    // MARK: Calling candidate window using Up / Down or PageUp / PageDn.
 
     if let currentState = state as? InputState.NotEmpty, _composer.isEmpty,
       input.isExtraChooseCandidateKey || input.isExtraChooseCandidateKeyReverse || input.isSpace
-        || input.isPageDown || input.isPageUp || input.isTab
+        || input.isPageDown || input.isPageUp || (input.isTab && mgrPrefs.specifyShiftTabKeyBehavior)
         || (input.useVerticalMode && (input.isVerticalModeOnlyChooseCandidateKey))
     {
       if input.isSpace {