diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index a6d9f85dc8..cf1e6926ae 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -550,8 +550,10 @@ class Editor extends React.Component {
                     </div>
                   </div>
                   {loadingDataSources ? (
-                    <div className="m-3">
-                      <Skeleton count={8} />
+                    <div className="p-5">
+                      <center>
+                        <div class="spinner-border text-azure" role="status"></div>
+                      </center>
                     </div>
                   ) : (
                     <div className="m-2">
@@ -633,8 +635,10 @@ class Editor extends React.Component {
                       </div>
 
                       {loadingDataQueries ? (
-                        <div className="m-3">
-                          <Skeleton count={8} />
+                        <div className="p-5">
+                          <center>
+                            <div class="spinner-border text-azure" role="status"></div>
+                          </center>
                         </div>
                       ) : (
                         <div className="">