diff --git a/app/src/main/java/com/telefonica/tweaks/demo/MainActivity.kt b/app/src/main/java/com/telefonica/tweaks/demo/MainActivity.kt
index 8e14cef..a0e2938 100644
--- a/app/src/main/java/com/telefonica/tweaks/demo/MainActivity.kt
+++ b/app/src/main/java/com/telefonica/tweaks/demo/MainActivity.kt
@@ -5,21 +5,25 @@ import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.telefonica.tweaks.Tweaks.Companion.TWEAKS_NAVIGATION_ENTRYPOINT
 import com.telefonica.tweaks.addTweakGraph
 import com.telefonica.tweaks.demo.theme.DebugTweaksTheme
 import com.telefonica.tweaks.navigateToTweaksOnShake
@@ -41,7 +45,7 @@ class MainActivity : ComponentActivity() {
                 Surface(color = MaterialTheme.colorScheme.background) {
                     DemoNavHost(
                         navController = navController,
-                        initialScreen = "tweaks",
+                        initialScreen = "main-screen",
                     )
                 }
             }
@@ -59,6 +63,27 @@ class MainActivity : ComponentActivity() {
             startDestination = initialScreen,
             modifier = modifier,
         ) {
+            composable(
+                route = "main-screen",
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .background(Color.White)
+                        .padding(16.dp),
+                    verticalArrangement = Arrangement.Center,
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    Button(
+                        onClick = { navController.navigate(TWEAKS_NAVIGATION_ENTRYPOINT) }
+                    ) {
+                        Text(
+                            text = "Tweaks",
+                            color = Color.White
+                        )
+                    }
+                }
+            }
             addTweakGraph(
                 navController = navController,
             ) {
diff --git a/library/src/enabled/java/com/telefonica/tweaks/Tweaks.kt b/library/src/enabled/java/com/telefonica/tweaks/Tweaks.kt
index d89139e..588d984 100644
--- a/library/src/enabled/java/com/telefonica/tweaks/Tweaks.kt
+++ b/library/src/enabled/java/com/telefonica/tweaks/Tweaks.kt
@@ -121,7 +121,7 @@ private fun DetectShakeAndNavigate(onShakeDetected: () -> Unit) {
             vibrateIfAble(context)
             shouldNavigate = true
         }
-        shakeDetector.start(sensorManager, SensorManager.SENSOR_DELAY_NORMAL)
+        shakeDetector.start(sensorManager, SensorManager.SENSOR_DELAY_UI)
     }
 
     LaunchedEffect(shouldNavigate) {