diff --git a/components/mobilehomescreencomponents/qml/appdrawer/DrawerGridDelegate.qml b/components/mobilehomescreencomponents/qml/appdrawer/DrawerGridDelegate.qml
index 39b37389..87311d2f 100644
--- a/components/mobilehomescreencomponents/qml/appdrawer/DrawerGridDelegate.qml
+++ b/components/mobilehomescreencomponents/qml/appdrawer/DrawerGridDelegate.qml
@@ -42,9 +42,6 @@ MouseArea {
         } else {
             delegate.launch(delegate.x + (PlasmaCore.Units.smallSpacing * 2), delegate.y + (PlasmaCore.Units.smallSpacing * 2), icon.source, model.applicationName, model.applicationStorageId);
         }
-        
-        // close the app drawer
-        MobileShell.HomeScreenControls.openHomeScreen();
     }
 
     //preventStealing: true
diff --git a/components/mobilehomescreencomponents/qml/appdrawer/DrawerListDelegate.qml b/components/mobilehomescreencomponents/qml/appdrawer/DrawerListDelegate.qml
index 65115a92..049ecdca 100644
--- a/components/mobilehomescreencomponents/qml/appdrawer/DrawerListDelegate.qml
+++ b/components/mobilehomescreencomponents/qml/appdrawer/DrawerListDelegate.qml
@@ -40,9 +40,6 @@ MouseArea {
         } else {
             delegate.launch(delegate.x + (PlasmaCore.Units.smallSpacing * 2), delegate.y + (PlasmaCore.Units.smallSpacing * 2), icon.source, model.applicationName, model.applicationStorageId);
         }
-        
-        // close the app drawer
-        MobileShell.HomeScreenControls.openHomeScreen();
     }
     hoverEnabled: true
     
diff --git a/components/mobileshell/qml/components/StartupFeedback.qml b/components/mobileshell/qml/components/StartupFeedback.qml
index b302bfa6..8f30f966 100644
--- a/components/mobileshell/qml/components/StartupFeedback.qml
+++ b/components/mobileshell/qml/components/StartupFeedback.qml
@@ -179,6 +179,13 @@ MouseArea { // use mousearea to ensure clicks don't go behind
                                 easing.type: Easing.OutCubic
                             }
                         }
+                        
+                        ScriptAction {
+                            script: {
+                                // close the app drawer after it isn't visible
+                                MobileShell.HomeScreenControls.resetHomeScreenPosition();
+                            }
+                        }
                     }
                 }
             ]