diff --git a/frontend/src/Editor/Container.jsx b/frontend/src/Editor/Container.jsx
index 444063dec8..99dcb702d4 100644
--- a/frontend/src/Editor/Container.jsx
+++ b/frontend/src/Editor/Container.jsx
@@ -818,6 +818,8 @@ export const Container = ({
     ? 'Connect to your data source or use our sample data source to start playing around!'
     : 'Connect to a data source to be able to create a query';
 
+  const showEmptyContainer = !appLoading && !isDragging && mode !== 'view';
+
   return (
     <ContainerWrapper
       showComments={showComments}
@@ -930,7 +932,7 @@ export const Container = ({
           />
         </div>
       </div>
-      {Object.keys(boxes).length === 0 && !appLoading && !isDragging && (
+      {Object.keys(boxes).length === 0 && showEmptyContainer && (
         <div style={{ paddingTop: '10%' }}>
           <div className="row empty-box-cont">
             <div className="col-md-4 dotted-cont">
diff --git a/frontend/src/Editor/Header/index.js b/frontend/src/Editor/Header/index.js
index 33a0d4c05c..8743c81596 100644
--- a/frontend/src/Editor/Header/index.js
+++ b/frontend/src/Editor/Header/index.js
@@ -73,7 +73,7 @@ export default function EditorHeader({
       : '';
     setAppPreviewLink(appVersionPreviewLink);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [slug, currentVersionId, editingVersion]);
+  }, [slug, currentVersionId, editingVersion, pageHandle]);
 
   return (
     <div className={cx('header', { 'dark-theme theme-dark': darkMode })} style={{ width: '100%' }}>