diff --git a/src/store/modules/dashboard.ts b/src/store/modules/dashboard.ts
index 20afe2fb..29b14408 100644
--- a/src/store/modules/dashboard.ts
+++ b/src/store/modules/dashboard.ts
@@ -207,9 +207,11 @@ export const dashboardStore = defineStore({
     },
     removeTabItem(item: LayoutConfig, index: number) {
       const idx = this.layout.findIndex((d: LayoutConfig) => d.i === item.i);
-      for (const item of this.layout[idx].children[index].children) {
-        if (this.selectedGrid.i === item.i) {
-          this.selectedGrid = null;
+      if (this.selectedGrid) {
+        for (const item of this.layout[idx].children[index].children) {
+          if (this.selectedGrid.i === item.i) {
+            this.selectedGrid = null;
+          }
         }
       }
       if (this.layout[idx].children) {
@@ -271,6 +273,7 @@ export const dashboardStore = defineStore({
         };
         this.selectedGrid =
           this.layout[index].children[tabIndex].children[itemIndex];
+        this.setCurrentTabItems(this.layout[index].children[tabIndex].children);
         return;
       }
       this.layout[index] = {
diff --git a/src/views/dashboard/controls/Tab.vue b/src/views/dashboard/controls/Tab.vue
index 3c8a1fe2..0237f938 100644
--- a/src/views/dashboard/controls/Tab.vue
+++ b/src/views/dashboard/controls/Tab.vue
@@ -56,9 +56,8 @@ limitations under the License. -->
       :row-height="10"
       :is-draggable="true"
       :is-resizable="true"
-      :vertical-compact="true"
-      :use-css-transforms="true"
       :responsive="true"
+      @layout-updated="layoutUpdatedEvent"
     >
       <grid-item
         v-for="item in dashboardStore.currentTabItems"
@@ -112,15 +111,12 @@ export default defineComponent({
         .children
     );
 
-    function layoutUpdatedEvent(newLayout: LayoutConfig[]) {
-      dashboardStore.setCurrentTabItems(newLayout);
-    }
     function clickTabs(e: Event, idx: number) {
       e.stopPropagation();
       activeTabIndex.value = idx;
-      dashboardStore.activeGridItem(
-        `${props.data.i}-${activeTabIndex.value}-0`
-      );
+      dashboardStore.activeGridItem(props.data.i);
+      dashboardStore.selectWidget(props.data);
+      dashboardStore.setActiveTabIndex(idx);
       dashboardStore.setCurrentTabItems(
         dashboardStore.layout[props.data.i].children[activeTabIndex.value]
           .children
@@ -154,13 +150,8 @@ export default defineComponent({
         `${props.data.i}-${activeTabIndex.value}-${item.i}`
       );
     }
-    function breakpointChangedEvent(newBreakpoint: any, newLayout: any) {
-      console.log(
-        "BREAKPOINT CHANGED breakpoint=",
-        newBreakpoint,
-        ", layout: ",
-        newLayout
-      );
+    function layoutUpdatedEvent(newLayout: LayoutConfig[]) {
+      dashboardStore.setCurrentTabItems(newLayout);
     }
     document.body.addEventListener("click", handleClick, false);
     watch(
@@ -179,14 +170,13 @@ export default defineComponent({
       }
     );
     return {
+      layoutUpdatedEvent,
       clickTabGrid,
       editTabName,
       addTabItem,
       deleteTabItem,
       removeTab,
       clickTabs,
-      layoutUpdatedEvent,
-      breakpointChangedEvent,
       ...toRefs(props),
       activeTabWidget,
       dashboardStore,
@@ -203,7 +193,7 @@ export default defineComponent({
 
   span {
     display: inline-block;
-    padding: 0 10px;
+    padding: 0 20px;
     margin: 0 10px;
     height: 40px;
     line-height: 40px;
diff --git a/src/views/dashboard/panel/Layout.vue b/src/views/dashboard/panel/Layout.vue
index ba0c49a7..bc3938f8 100644
--- a/src/views/dashboard/panel/Layout.vue
+++ b/src/views/dashboard/panel/Layout.vue
@@ -19,7 +19,6 @@ limitations under the License. -->
     :row-height="10"
     :is-draggable="true"
     :is-resizable="true"
-    :responsive="true"
     @layout-updated="layoutUpdatedEvent"
   >
     <grid-item