diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7687acb4..b8834c1a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -43,7 +43,7 @@ android {
     defaultConfig {
         applicationId = "app.grapheneos.apps"
         minSdk = 31
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 27
         versionName = versionCode.toString()
         resourceConfigurations.add("en")
diff --git a/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt b/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt
index becc7629..131c3571 100644
--- a/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt
+++ b/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt
@@ -75,4 +75,9 @@ class PackageDownloadFgService : Service() {
     }
 
     override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onTimeout(startId: Int, fgsType: Int) {
+        super.onTimeout(startId, fgsType)
+        stopSelf()
+    }
 }
diff --git a/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt b/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt
index 8d8e06d5..9642f74e 100644
--- a/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.Bundle
 import android.view.ViewGroup
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
@@ -36,7 +37,7 @@ class MainActivity : AppCompatActivity() {
         val views = MainActivityBinding.inflate(layoutInflater)
         this.views = views
 
-        window.setDecorFitsSystemWindows(false)
+        enableEdgeToEdge()
 
         ViewCompat.setOnApplyWindowInsetsListener(views.root) { v, insets ->
             val paddingInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())