Another small bugfix for remote/keyboard