diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt
index c4254177f7..b89df15512 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt
@@ -39,6 +39,7 @@ import com.tailscale.ipn.ui.viewModel.SettingsNav
 import com.tailscale.ipn.ui.viewModel.SettingsViewModel
 import com.tailscale.ipn.ui.viewModel.VpnViewModel
 import com.tailscale.ipn.ui.notifier.Notifier
+import com.tailscale.ipn.ui.util.AndroidTVUtil
 import com.tailscale.ipn.ui.util.AppVersion
 
 @Composable
@@ -96,9 +97,10 @@ fun SettingsView(settingsNav: SettingsNav, viewModel: SettingsViewModel = viewMo
                     },
                 onClick = settingsNav.onNavigateToTailnetLock)
           }
-
-          Lists.ItemDivider()
-          Setting.Text(R.string.permissions, onClick = settingsNav.onNavigateToPermissions)
+          if (!AndroidTVUtil.isAndroidTV()){
+            Lists.ItemDivider()
+            Setting.Text(R.string.permissions, onClick = settingsNav.onNavigateToPermissions)
+          }
 
           managedByOrganization.value?.let {
             Lists.ItemDivider()
diff --git a/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt b/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt
index 7499fc0c0f..ade28c074a 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/viewModel/LoginQRViewModel.kt
@@ -23,7 +23,7 @@ class LoginQRViewModel : IpnViewModel() {
   val numCode: StateFlow<String?> = MutableStateFlow(null)
   val qrCode: StateFlow<ImageBitmap?> = MutableStateFlow(null)
   // Remove this once changes to admin console allowing input code to be entered are made.
-  val codeEnabled = false
+  val codeEnabled = true
 
   init {
     viewModelScope.launch {