diff --git a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
index 13d80a6ede..4b58ae2597 100644
--- a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
+++ b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
@@ -9,6 +9,7 @@ import {
   RiListUnordered,
   RiText,
 } from "react-icons/ri";
+import { PartialBlock } from "../../../../../core/src/extensions/Blocks/api/blockTypes";
 
 import { ToolbarDropdown } from "../../../SharedComponents/Toolbar/components/ToolbarDropdown";
 import { useEditorSelectionChange } from "../../../hooks/useEditorSelectionChange";
@@ -109,10 +110,14 @@ export const BlockTypeDropdown = <BSchema extends BlockSchema>(props: {
           props.editor.focus();
           props.editor.updateBlock(block, {
             type: item.type,
-            props: {},
-          });
+            props: item.type === "heading" ? { level: item.props?.level } : {},
+          } as PartialBlock<BSchema>);
         },
-        isSelected: block.type === item.type,
+        isSelected:
+          block.type === item.type &&
+          (block.type === "heading"
+            ? block.props.level === item.props?.level
+            : true),
       })),
     [block, filteredItems, props.editor]
   );