@@ -352,7 +352,6 @@ FocusScope {
352352 width: Math.min(root.width, units.gu(90)) * .9
353353 panelWidth: panel.width
354354 visible: x > -width
355− focus: visible
356355
357356 Behavior on anchors.rightMargin {
358357 enabled: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate && !drawer.draggingHorizontally
@@ -465,6 +464,8 @@ FocusScope {
465464 onPassed: {
466465 if (root.drawerEnabled) {
467466 root.switchToNextState("drawer");
467+ root.focus = true;
468+ drawer.focus = true;
468469 }
469470 }
470471
@@ -521,6 +522,7 @@ FocusScope {
521522 if (root.drawerEnabled && distance > panel.width * 3) {
522523 root.switchToNextState("drawer")
523524 root.focus = true;
525+ drawer.focus = true;
524526 } else {
525527 root.switchToNextState("visible")
526528 }