Added shortcut enabled check to shortcut observer