diff --git a/packages/nc-gui/components/dashboard/MiniSidebar/CreateNewActionMenu.vue b/packages/nc-gui/components/dashboard/MiniSidebar/CreateNewActionMenu.vue
index a1dc514d79..992c95117b 100644
--- a/packages/nc-gui/components/dashboard/MiniSidebar/CreateNewActionMenu.vue
+++ b/packages/nc-gui/components/dashboard/MiniSidebar/CreateNewActionMenu.vue
@@ -27,7 +27,7 @@ const { isAiFeaturesEnabled } = useNocoAi()
 
 const { isFeatureEnabled } = useBetaFeatureToggle()
 
-const { showUpgradeToUseTimelineView } = useEeConfig()
+const { showUpgradeToUseTimelineView, showUpgradeToUseMapView } = useEeConfig()
 
 const isVisibleCreateNew = ref(false)
 
@@ -264,6 +264,14 @@ const hasDashboardCreateAccess = computed(() => {
                   <div>{{ $t('objects.viewType.list') }}</div>
                 </NcMenuItem>
               </template>
+              <NcMenuItem
+                v-if="isEeUI && isFeatureEnabled(FEATURE_FLAG.MAP_VIEW)"
+                data-testid="mini-sidebar-view-create-map"
+                @click="showUpgradeToUseMapView({ successCallback: () => onOpenModal({ type: ViewTypes.MAP }) })"
+              >
+                <GeneralViewIcon :meta="{ type: ViewTypes.MAP }" class="!w-4 !h-4" />
+                <div>{{ $t('objects.viewType.map') }}</div>
+              </NcMenuItem>
               <NcMenuItem
                 v-if="isEeUI && isFeatureEnabled(FEATURE_FLAG.TIMELINE)"
                 data-testid="mini-sidebar-view-create-timeline"
diff --git a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
index 53ad760026..f99264c434 100644
--- a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
@@ -23,7 +23,7 @@ const { isAiFeaturesEnabled } = useNocoAi()
 
 const { isFeatureEnabled } = useBetaFeatureToggle()
 
-const { blockMapView, showUpgradeToUseMapView, showUpgradeToUseTimelineView } = useEeConfig()
+const { blockMapView, blockTimelineView, showUpgradeToUseMapView, showUpgradeToUseTimelineView } = useEeConfig()
 
 const table = inject(SidebarTableInj)!
 const base = inject(ProjectInj)!
@@ -221,9 +221,18 @@ function onCreateSection() {
           </NcTooltip>
         </template>
         <NcMenuItem
-          v-if="isEeUI && isEeUI && isFeatureEnabled(FEATURE_FLAG.MAP_VIEW)"
+          v-if="isEeUI && isFeatureEnabled(FEATURE_FLAG.MAP_VIEW)"
           data-testid="sidebar-view-create-map"
-          @click="blockMapView ? showUpgradeToUseMapView() : onOpenModal({ type: ViewTypes.MAP })"
+          @click="
+            () => {
+              isOpen = false
+              showUpgradeToUseMapView({
+                successCallback: () => {
+                  onOpenModal({ type: ViewTypes.MAP })
+                },
+              })
+            }
+          "
         >
           <div class="item">
             <div class="item-inner">
@@ -231,7 +240,7 @@ function onCreateSection() {
               <div>{{ $t('objects.viewType.map') }}</div>
             </div>
 
-            <template v-if="isEeUI && blockMapView">
+            <template v-if="blockMapView">
               <PaymentUpgradeBadge :feature="PlanFeatureTypes.FEATURE_MAP_VIEW" :plan-title="PlanTitles.BUSINESS" remove-click />
             </template>
             <template v-else>
@@ -241,19 +250,32 @@ function onCreateSection() {
           </div>
         </NcMenuItem>
         <NcMenuItem
-          v-if="isFeatureEnabled(FEATURE_FLAG.TIMELINE)"
+          v-if="isEeUI && isFeatureEnabled(FEATURE_FLAG.TIMELINE)"
           data-testid="sidebar-view-create-timeline"
-          @click="showUpgradeToUseTimelineView({ successCallback: () => onOpenModal({ type: ViewTypes.TIMELINE }) })"
+          @click="
+            () => {
+              isOpen = false
+              showUpgradeToUseTimelineView({
+                successCallback: () => {
+                  onOpenModal({ type: ViewTypes.TIMELINE })
+                },
+              })
+            }
+          "
         >
           <div class="item">
             <div class="item-inner">
               <GeneralViewIcon :meta="{ type: ViewTypes.TIMELINE }" class="!w-4 !h-4" />
               <div>{{ $t('objects.viewType.timeline') }}</div>
-              <PaymentUpgradeBadge :feature="PlanFeatureTypes.FEATURE_TIMELINE_VIEW" />
             </div>
 
-            <GeneralLoader v-if="toBeCreateType === ViewTypes.TIMELINE && isViewListLoading" />
-            <GeneralIcon v-else class="plus" icon="plus" />
+            <template v-if="blockTimelineView">
+              <PaymentUpgradeBadge :feature="PlanFeatureTypes.FEATURE_TIMELINE_VIEW" :plan-title="PlanTitles.PLUS" remove-click />
+            </template>
+            <template v-else>
+              <GeneralLoader v-if="toBeCreateType === ViewTypes.TIMELINE && isViewListLoading" />
+              <GeneralIcon v-else class="plus" icon="plus" />
+            </template>
           </div>
         </NcMenuItem>
 
@@ -261,7 +283,7 @@ function onCreateSection() {
           <!-- Section -->
           <NcDivider />
 
-          <DashboardTreeViewCreateViewBtnSectionMenu @create-section="onCreateSection" />
+          <DashboardTreeViewCreateViewBtnSectionMenu @create-section="onCreateSection" @close="isOpen = false" />
         </template>
 
         <template v-if="isAiFeaturesEnabled">
diff --git a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn/SectionMenu.vue b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn/SectionMenu.vue
index aab90856c5..bf807d8e2b 100644
--- a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn/SectionMenu.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn/SectionMenu.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 defineEmits<{
   (event: 'createSection'): void
+  (event: 'close'): void
 }>()
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/header/ColumnMenu.vue b/packages/nc-gui/components/smartsheet/header/ColumnMenu.vue
index a3c18d467e..227d5b7777 100644
--- a/packages/nc-gui/components/smartsheet/header/ColumnMenu.vue
+++ b/packages/nc-gui/components/smartsheet/header/ColumnMenu.vue
@@ -682,8 +682,10 @@ const onDeleteColumn = () => {
       "
       data-testid="nc-column-convert-link-v2"
       @click="
-        isOpen = false
-        showConvertLinkV2Modal = true
+        () => {
+          isOpen = false
+          showConvertLinkV2Modal = true
+        }
       "
     >
       <div class="nc-column-convert-v2 nc-header-menu-item">
diff --git a/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue b/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue
index a6f9b97d11..020031c56d 100644
--- a/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue
+++ b/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue
@@ -261,18 +261,11 @@ async function onOpenModal({
                 <a-menu-item
                   v-if="isEeUI && isFeatureEnabled(FEATURE_FLAG.MAP_VIEW)"
                   data-testid="topbar-view-create-map"
-                  @click="blockMapView ? showUpgradeToUseMapView() : onOpenModal({ type: ViewTypes.MAP })"
+                  @click="showUpgradeToUseMapView({ successCallback: () => onOpenModal({ type: ViewTypes.MAP }) })"
                 >
                   <div class="nc-viewlist-submenu-popup-item">
                     <GeneralViewIcon :meta="{ type: ViewTypes.MAP }" />
                     {{ $t('objects.viewType.map') }}
-                    <PaymentUpgradeBadge
-                      v-if="blockMapView"
-                      :feature="PlanFeatureTypes.FEATURE_MAP_VIEW"
-                      :plan-title="PlanTitles.BUSINESS"
-                      remove-click
-                      class="ml-auto"
-                    />
                   </div>
                 </a-menu-item>
                 <a-menu-item