another attempt at fixing the shortcut-mode drawer strangeness while retaining overall back navigation