diff --git a/src/panelWebView/ViewPanel.tsx b/src/panelWebView/ViewPanel.tsx
index cf2eec3d..ba7ed5bd 100644
--- a/src/panelWebView/ViewPanel.tsx
+++ b/src/panelWebView/ViewPanel.tsx
@@ -124,12 +124,26 @@ export const ViewPanel: React.FunctionComponent<IViewPanelProps> = () => {
           <GitAction settings={settings} />
         </FeatureFlag>
 
-        {!loading && (<CustomView metadata={metadata} />)}
-
         <FeatureFlag features={mode?.features || DEFAULT_PANEL_FEATURE_FLAGS} flag={FEATURE_FLAG.panel.globalSettings}>
           <GlobalSettings settings={settings} isBase={!metadata} />
         </FeatureFlag>
 
+        {
+          !loading && metadata && (
+            <FeatureFlag features={mode?.features || DEFAULT_PANEL_FEATURE_FLAGS} flag={FEATURE_FLAG.panel.metadata}>
+              <Metadata
+                settings={settings}
+                metadata={metadata}
+                focusElm={focusElm}
+                unsetFocus={unsetFocus}
+                features={mode?.features || DEFAULT_PANEL_FEATURE_FLAGS}
+              />
+            </FeatureFlag>
+          )
+        }
+
+        {!loading && (<CustomView metadata={metadata} />)}
+
         {
           !loading && metadata && settings && settings.seo && (
             <FeatureFlag features={mode?.features || DEFAULT_PANEL_FEATURE_FLAGS} flag={FEATURE_FLAG.panel.seo}>
@@ -153,20 +167,6 @@ export const ViewPanel: React.FunctionComponent<IViewPanelProps> = () => {
           </FeatureFlag>
         )}
 
-        {
-          !loading && metadata && (
-            <FeatureFlag features={mode?.features || DEFAULT_PANEL_FEATURE_FLAGS} flag={FEATURE_FLAG.panel.metadata}>
-              <Metadata
-                settings={settings}
-                metadata={metadata}
-                focusElm={focusElm}
-                unsetFocus={unsetFocus}
-                features={mode?.features || DEFAULT_PANEL_FEATURE_FLAGS}
-              />
-            </FeatureFlag>
-          )
-        }
-
         <FeatureFlag features={mode?.features || DEFAULT_PANEL_FEATURE_FLAGS} flag={FEATURE_FLAG.panel.recentlyModified}>
           <FolderAndFiles data={folderAndFiles} isBase={!metadata} />
         </FeatureFlag>