diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
index eb67c0e..3b70360 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
@@ -1170,8 +1170,31 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
                 val deltaY = e2.y - e1.y
                 val deltaX = e2.x - e1.x
 
+                // Swipe right
+                if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && sharedPreferenceManager.isGestureEnabled("right")) {
+                    if (rightSwipeActivity.first != null && rightSwipeActivity.second != null) {
+                        canLaunchShortcut = false
+                        appUtils.launchApp(rightSwipeActivity.first!!.componentName, launcherApps.profiles[rightSwipeActivity.second!!])
+                    } else {
+                        Toast.makeText(this@MainActivity, getString(R.string.launch_error), Toast.LENGTH_SHORT).show()
+                    }
+                }
+                else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && !sharedPreferenceManager.isGestureEnabled("right")) {
+                    if (gestureUtils.isAccessibilityServiceEnabled(
+                            ScreenLockService::class.java
+                        )
+                    ) {
+                        val intent = Intent(this@MainActivity, ScreenLockService::class.java)
+                        intent.action = "RECENTS"
+                        startService(intent)
+                        finishAndRemoveTask()
+                    } else {
+                        gestureUtils.promptEnableAccessibility()
+                    }
+                }
+
                 // Swipe up
-                if (deltaY < -swipeThreshold && abs(velocityY) > swipeVelocityThreshold) {
+                else if (deltaY < -swipeThreshold && abs(velocityY) > swipeVelocityThreshold) {
                     canLaunchShortcut = false
                     openAppMenu()
                 }
@@ -1194,30 +1217,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
                         Toast.makeText(this@MainActivity, getString(R.string.launch_error), Toast.LENGTH_SHORT).show()
                     }
                 }
-
-
-                    // Swipe right
-                else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && sharedPreferenceManager.isGestureEnabled("right")) {
-                    if (rightSwipeActivity.first != null && rightSwipeActivity.second != null) {
-                        canLaunchShortcut = false
-                        appUtils.launchApp(rightSwipeActivity.first!!.componentName, launcherApps.profiles[rightSwipeActivity.second!!])
-                    } else {
-                        Toast.makeText(this@MainActivity, getString(R.string.launch_error), Toast.LENGTH_SHORT).show()
-                    }
-                }
-                else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && !sharedPreferenceManager.isGestureEnabled("right")) {
-                    if (gestureUtils.isAccessibilityServiceEnabled(
-                            ScreenLockService::class.java
-                        )
-                    ) {
-                        val intent = Intent(this@MainActivity, ScreenLockService::class.java)
-                        intent.action = "RECENTS"
-                        startService(intent)
-                        finishAndRemoveTask()
-                    } else {
-                        gestureUtils.promptEnableAccessibility()
-                    }
-                }
             }
             return true
         }