diff --git a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
index 13d80a6ed..de3bda689 100644
--- a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
+++ b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
@@ -112,7 +112,11 @@ export const BlockTypeDropdown = <BSchema extends BlockSchema>(props: {
             props: {},
           });
         },
-        isSelected: block.type === item.type,
+        isSelected:
+          block.type === item.type &&
+          (block.type === "heading"
+            ? block.props.level === item.props?.level
+            : true),
       })),
     [block, filteredItems, props.editor]
   );