Real workaround (+ some hotkey restructure)