[BUGFIX] Only resolve shortcuts if page type is shortcut

Checking on mode is insufficient.