diff --git a/addons/web/static/src/views/fields/state_selection/state_selection_field.js b/addons/web/static/src/views/fields/state_selection/state_selection_field.js
index 937a5f4022f..acd97912c04 100644
--- a/addons/web/static/src/views/fields/state_selection/state_selection_field.js
+++ b/addons/web/static/src/views/fields/state_selection/state_selection_field.js
@@ -51,9 +51,6 @@ export class StateSelectionField extends Component {
             return [state, this.props.record.data[`legend_${state}`] || label];
         });
     }
-    get availableOptions() {
-        return this.options.filter((o) => o[0] !== this.currentValue);
-    }
     get currentValue() {
         return this.props.value || this.options[0][0];
     }
diff --git a/addons/web/static/src/views/fields/state_selection/state_selection_field.xml b/addons/web/static/src/views/fields/state_selection/state_selection_field.xml
index 2c9fc133871..2f343e74f69 100644
--- a/addons/web/static/src/views/fields/state_selection/state_selection_field.xml
+++ b/addons/web/static/src/views/fields/state_selection/state_selection_field.xml
@@ -9,19 +9,19 @@
             </button>
         </t>
         <t t-else="">
-            <Dropdown tooltip="label" togglerClass="'btn btn-link d-flex p-0'">
+            <Dropdown togglerClass="'btn btn-link d-flex p-0'">
                 <t t-set-slot="toggler">
                     <div class="d-flex align-items-center">
                         <span t-attf-class="o_status {{ statusColor(currentValue) }} "/>
                         <span t-if="showLabel" class="o_status_label ms-1" t-esc="label"/>
                     </div>
                 </t>
-                <t t-foreach="availableOptions" t-as="option" t-key="option[0]">
-                    <DropdownItem onSelected="() => this.updateRecord(option[0])">
-                        <div class="d-flex align-items-center">
-                            <span t-attf-class="o_status {{ statusColor(option[0]) }} "/>
-                            <span class="ms-2" t-esc="option[1]"/>
-                        </div>
+                <t t-foreach="options" t-as="option" t-key="option[0]">
+                    <DropdownItem
+                        class="`d-flex align-items-center ${option[0] === currentValue ? 'active' : ''}`"
+                        onSelected="() => this.updateRecord(option[0])">
+                            <span t-attf-class="o_status ms-3 {{ statusColor(option[0]) }} "/>
+                            <span t-esc="option[1]"/>
                     </DropdownItem>
                 </t>
             </Dropdown>
diff --git a/addons/web/static/tests/views/fields/state_selection_field_tests.js b/addons/web/static/tests/views/fields/state_selection_field_tests.js
index ceb0647f93f..1da2740c221 100644
--- a/addons/web/static/tests/views/fields/state_selection_field_tests.js
+++ b/addons/web/static/tests/views/fields/state_selection_field_tests.js
@@ -83,11 +83,6 @@ QUnit.module("Fields", (hooks) => {
             "should not have one green status since selection is the second, blocked state"
         );
         assert.containsNone(target, ".dropdown-menu", "there should not be a dropdown");
-        assert.strictEqual(
-            target.querySelector(".o_field_state_selection .dropdown-toggle").dataset.tooltip,
-            "Blocked",
-            "tooltip attribute has the right text"
-        );
 
         // Click on the status button to make the dropdown appear
         await click(target, ".o_field_widget.o_field_state_selection .o_status");
@@ -95,8 +90,13 @@ QUnit.module("Fields", (hooks) => {
         assert.containsN(
             target,
             ".dropdown-menu .dropdown-item",
-            2,
-            "there should be two options in the dropdown"
+            3,
+            "there should be three options in the dropdown"
+        );
+        assert.hasClass(
+            target.querySelector(".dropdown-menu .dropdown-item:nth-child(2)"),
+            "active",
+            "current value has a checkmark"
         );
 
         // Click on the first option, "Normal"
@@ -141,8 +141,8 @@ QUnit.module("Fields", (hooks) => {
         assert.containsN(
             target,
             ".dropdown-menu .dropdown-item",
-            2,
-            "there should be two options in the dropdown"
+            3,
+            "there should be three options in the dropdown"
         );
 
         // Click on the last option, "Done"
@@ -297,8 +297,8 @@ QUnit.module("Fields", (hooks) => {
         assert.containsN(
             target,
             ".dropdown-menu .dropdown-item",
-            2,
-            "there should be two options in the dropdown"
+            3,
+            "there should be three options in the dropdown"
         );
 
         // Click on the first option, "Normal"
@@ -352,8 +352,8 @@ QUnit.module("Fields", (hooks) => {
         assert.containsN(
             target,
             ".dropdown-menu .dropdown-item",
-            2,
-            "there should be two options in the dropdown"
+            3,
+            "there should be three options in the dropdown"
         );
 
         // Click on another row
@@ -382,8 +382,8 @@ QUnit.module("Fields", (hooks) => {
         assert.containsN(
             target,
             ".dropdown-menu .dropdown-item",
-            2,
-            "there should be two options in the dropdown"
+            3,
+            "there should be three options in the dropdown"
         );
 
         // Click on the last option, "Done"
@@ -495,17 +495,17 @@ QUnit.module("Fields", (hooks) => {
         });
 
         await click(target, ".o_status");
-        let dropdownItemTexts = [...target.querySelectorAll(".dropdown-item")].map(
-            (el) => el.textContent
-        );
-        assert.deepEqual(dropdownItemTexts, ["Custom normal", "Custom done"]);
+        let dropdownItemTexts = [
+            ...target.querySelectorAll(".o_field_state_selection .dropdown-item"),
+        ].map((el) => el.textContent);
+        assert.deepEqual(dropdownItemTexts, ["Custom normal", "Custom blocked", "Custom done"]);
 
         await click(target.querySelector(".dropdown-item .o_status"));
         await click(target, ".o_status");
-        dropdownItemTexts = [...target.querySelectorAll(".dropdown-item")].map(
-            (el) => el.textContent
-        );
-        assert.deepEqual(dropdownItemTexts, ["Custom blocked", "Custom done"]);
+        dropdownItemTexts = [
+            ...target.querySelectorAll(".o_field_state_selection .dropdown-item"),
+        ].map((el) => el.textContent);
+        assert.deepEqual(dropdownItemTexts, ["Custom normal", "Custom blocked", "Custom done"]);
     });
 
     QUnit.test("works when required in a readonly view ", async function (assert) {
@@ -534,7 +534,7 @@ QUnit.module("Fields", (hooks) => {
         });
 
         await click(target, ".o_field_state_selection button");
-        const doneItem = target.querySelectorAll(".dropdown-item")[1]; // item "done";
+        const doneItem = target.querySelectorAll(".dropdown-item")[2]; // item "done";
         await click(doneItem);
 
         assert.verifySteps(["write"]);
diff --git a/addons/web/static/tests/views/kanban_view_tests.js b/addons/web/static/tests/views/kanban_view_tests.js
index 3fe096e0a6b..67fa712e452 100644
--- a/addons/web/static/tests/views/kanban_view_tests.js
+++ b/addons/web/static/tests/views/kanban_view_tests.js
@@ -2561,7 +2561,7 @@ QUnit.module("Views", (hooks) => {
 
         // Select state in kanban
         await click(getCard(0), ".o_status");
-        await click(getCard(0), ".o_field_state_selection .dropdown-item:first-child");
+        await click(getCard(0), ".o_field_state_selection .dropdown-item:nth-child(2)");
 
         assert.hasClass(
             target.querySelector(".o_status"),
@@ -11651,7 +11651,7 @@ QUnit.module("Views", (hooks) => {
         // Changes the state of the first record of the "Yes" column to "def"
         // The updated record should remain visible
         await click(getCard(2), ".o_status");
-        await click(getCard(2), ".o_field_state_selection .dropdown-item:first-child");
+        await click(getCard(2), ".o_field_state_selection .dropdown-item:nth-child(2)");
 
         assert.deepEqual(getCounters(), ["1", "1"]);
         assert.containsN(getColumn(1), ".o_kanban_record", 2);