diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt
index f1c433264..25798635a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt
@@ -62,7 +62,7 @@ enum class ConnectivityType(
     val resourceId: Int,
 ) {
     ALWAYS(null, 0, R.string.connectivity_type_always),
-    WIFI_ONLY(true, 1, R.string.connectivity_type_wifi_only),
+    WIFI_ONLY(true, 1, R.string.connectivity_type_unmetered_wifi_only),
     NEVER(false, 2, R.string.connectivity_type_never),
 }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
index ba1ead032..f59c2a2bd 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
@@ -186,8 +186,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun updateNetworkCapabilities(networkCapabilities: NetworkCapabilities): Boolean {
-        val isOnMobileData = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
-        val isOnWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+        val unmetered = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
+
+        val isOnMobileData = !unmetered || networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+        val isOnWifi = unmetered && networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
 
         var changedNetwork = false
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt
index aceca0ecf..0dbc381c0 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt
@@ -77,6 +77,7 @@ fun TextSpinner(
             readOnly = true,
             label = { label?.let { Text(it) } },
             modifier = modifier,
+            singleLine = true,
         )
     }
 }
@@ -200,4 +201,7 @@ fun <T> SpinnerSelectionDialog(
     }
 }
 
-@Immutable data class TitleExplainer(val title: String, val explainer: String? = null)
+@Immutable data class TitleExplainer(
+    val title: String,
+    val explainer: String? = null,
+)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1130f841e..63ed8c01e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -511,6 +511,7 @@
     <string name="settings">Settings</string>
     <string name="connectivity_type_always">Always</string>
     <string name="connectivity_type_wifi_only">Wifi-only</string>
+    <string name="connectivity_type_unmetered_wifi_only">Unmetered WiFi</string>
     <string name="connectivity_type_never">Never</string>
 
     <string name="ui_feature_set_type_complete">Complete</string>