diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AccountSelectionPresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AccountSelectionPresenter.java
index f9b5b00365..61d7c9725b 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AccountSelectionPresenter.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AccountSelectionPresenter.java
@@ -85,11 +85,13 @@ private void createAndShowDialog(List<Account> accounts, List<Drawable> icons, b
     private void appendAccountSelection(List<Account> accounts, List<Drawable> icons, AppDialogPresenter settingsPresenter) {
         List<OptionItem> optionItems = new ArrayList<>();
 
+        // "None" is selected only when no account is currently selected — otherwise the
+        // radio category renders two filled buttons (None + the active account).
         optionItems.add(UiOptionItem.from(
                 getContext().getString(R.string.dialog_account_none), optionItem -> {
                     selectAccount(null);
                     settingsPresenter.closeDialog();
-                }, true
+                }, mSignInService.getSelectedAccount() == null
         ));
 
         int index = -1;
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/AccountSettingsPresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/AccountSettingsPresenter.java
index fb951d279d..691efc6556 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/AccountSettingsPresenter.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/AccountSettingsPresenter.java
@@ -86,11 +86,13 @@ private void appendSelectAccountSection(List<Account> accounts, List<Drawable> i
 
         List<OptionItem> optionItems = new ArrayList<>();
 
+        // "None" is selected only when no account is currently selected — otherwise the
+        // radio category renders two filled buttons (None + the active account).
         optionItems.add(UiOptionItem.from(
                 getContext().getString(R.string.dialog_account_none), optionItem -> {
                     AccountSelectionPresenter.instance(getContext()).selectAccount(null);
                     settingsPresenter.closeDialog();
-                }, true
+                }, getSignInService().getSelectedAccount() == null
         ));
 
         CharSequence accountName = " (" + getContext().getString(R.string.dialog_account_none) + ")";