diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index 468f60b9f7..6f87c8c362 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -2,7 +2,6 @@
   import { Icon } from "@budibase/bbui"
   import { createEventDispatcher, getContext } from "svelte"
   import { helpers } from "@budibase/shared-core"
-  import { UserAvatar } from "@budibase/frontend-core"
   import UserAvatars from "../../pages/builder/app/[application]/_components/UserAvatars.svelte"
 
   export let icon
@@ -119,10 +118,6 @@
       </div>
     {/if}
   </div>
-
-  <!--{#if selectedBy}-->
-  <!--  <div class="selected-by-label">{helpers.getUserLabel(selectedBy)}</div>-->
-  <!--{/if}-->
 </div>
 
 <style>
@@ -172,37 +167,6 @@
     padding-left: var(--spacing-l);
   }
 
-  /*!* Selected user styles *!*/
-  /*.nav-item.selectedBy:after {*/
-  /*  content: "";*/
-  /*  position: absolute;*/
-  /*  width: calc(100% - 4px);*/
-  /*  height: 28px;*/
-  /*  border: 2px solid var(--selected-by-color);*/
-  /*  left: 0;*/
-  /*  top: 0;*/
-  /*  border-radius: 2px;*/
-  /*  pointer-events: none;*/
-  /*}*/
-  /*.selected-by-label {*/
-  /*  position: absolute;*/
-  /*  top: 0;*/
-  /*  right: 0;*/
-  /*  background: var(--selected-by-color);*/
-  /*  padding: 2px 4px;*/
-  /*  font-size: 12px;*/
-  /*  color: white;*/
-  /*  transform: translateY(calc(1px - 100%));*/
-  /*  border-top-right-radius: 2px;*/
-  /*  border-top-left-radius: 2px;*/
-  /*  pointer-events: none;*/
-  /*  opacity: 0;*/
-  /*  transition: opacity 130ms ease-out;*/
-  /*}*/
-  /*.nav-item.selectedBy:hover .selected-by-label {*/
-  /*  opacity: 1;*/
-  /*}*/
-
   /* Needed to fully display the actions icon */
   .nav-item.scrollable .nav-item-content {
     padding-right: 1px;
diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte
index f301e20b3d..dc6e0cb971 100644
--- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte
+++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte
@@ -27,7 +27,7 @@
     rowVerticalInversionIndex,
     columnHorizontalInversionIndex,
     selectedRows,
-    config,
+    loading,
     canAddRows,
   } = getContext("grid")
 
@@ -151,7 +151,7 @@
 <!-- New row FAB -->
 <TempTooltip
   text="Click here to create your first row"
-  condition={hasNoRows}
+  condition={hasNoRows && !$loading}
   type={TooltipType.Info}
 >
   {#if !visible && !selectedRowCount && $canAddRows}