diff --git a/assets/js/src/form_editor/store/reducers/save_form_started.jsx b/assets/js/src/form_editor/store/reducers/save_form_started.jsx
index 9f42b5499b..4a0183bbb4 100644
--- a/assets/js/src/form_editor/store/reducers/save_form_started.jsx
+++ b/assets/js/src/form_editor/store/reducers/save_form_started.jsx
@@ -4,6 +4,7 @@ export default (state) => {
   // remove all form saving related notices
   const notices = state.notices.filter((notice) => !['save-form', 'missing-lists'].includes(notice.id));
   const hasMissingLists = state.formErrors.includes('missing-lists');
+  const sidebarOpenedPanels = [...state.sidebar.openedPanels];
   if (hasMissingLists) {
     notices.push({
       id: 'missing-lists',
@@ -11,10 +12,19 @@ export default (state) => {
       isDismissible: true,
       status: 'error',
     });
+    if (!sidebarOpenedPanels.includes('basic-settings')) {
+      sidebarOpenedPanels.push('basic-settings');
+    }
   }
+
   return {
     ...state,
     isFormSaving: !hasMissingLists,
+    sidebar: {
+      ...state.sidebar,
+      activeTab: hasMissingLists ? 'form' : state.sidebar.activeTab,
+      openedPanels: sidebarOpenedPanels,
+    },
     notices,
   };
 };