diff --git a/assets/js/src/form_editor/components/sidebar.jsx b/assets/js/src/form_editor/components/sidebar.jsx
index abb6fd7fd8..554138b47e 100644
--- a/assets/js/src/form_editor/components/sidebar.jsx
+++ b/assets/js/src/form_editor/components/sidebar.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { IconButton } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
@@ -34,8 +34,21 @@ export default () => {
     []
   );
 
+  const selectedBlockId = useSelect(
+    (select) => select('core/block-editor').getSelectedBlockClientId(),
+    []
+  );
+
   const { toggleSidebar, switchSidebarTab } = useDispatch('mailpoet-form-editor');
 
+  useEffect(() => {
+    if (selectedBlockId) {
+      switchSidebarTab('block');
+    } else {
+      switchSidebarTab('form');
+    }
+  }, [selectedBlockId, switchSidebarTab]);
+
   return (
     <div className="edit-post-sidebar">
       <SidebarHeader closeSidebar={() => toggleSidebar(false)}>