diff --git a/frontend/pages/queries/edit/EditQueryPage.tsx b/frontend/pages/queries/edit/EditQueryPage.tsx
index 63604c88b8..92e5e7dc9f 100644
--- a/frontend/pages/queries/edit/EditQueryPage.tsx
+++ b/frontend/pages/queries/edit/EditQueryPage.tsx
@@ -336,39 +336,37 @@ const EditQueryPage = ({
   return (
     <>
       <MainContent className={baseClass}>
-        <div className={`${baseClass}_wrapper`}>
-          <div className={`${baseClass}__form`}>
-            <div className={`${baseClass}__header-links`}>
-              <BackLink
-                text={queryId ? "Back to report" : "Back to queries"}
-                path={backToQueriesPath()}
-              />
-            </div>
-            <EditQueryForm
-              router={router}
-              onSubmitNewQuery={onSubmitNewQuery}
-              onOsqueryTableSelect={onOsqueryTableSelect}
-              onUpdate={onUpdateQuery}
-              storedQuery={storedQuery}
-              queryIdForEdit={queryId}
-              apiTeamIdForQuery={apiTeamIdForQuery}
-              teamNameForQuery={teamNameForQuery}
-              isStoredQueryLoading={isStoredQueryLoading}
-              showOpenSchemaActionText={showOpenSchemaActionText}
-              onOpenSchemaSidebar={onOpenSchemaSidebar}
-              renderLiveQueryWarning={renderLiveQueryWarning}
-              backendValidators={backendValidators}
-              isQuerySaving={isQuerySaving}
-              isQueryUpdating={isQueryUpdating}
-              hostId={parseInt(location.query.host_ids as string, 10)}
-              queryReportsDisabled={
-                appConfig?.server_settings.query_reports_disabled
-              }
-              showConfirmSaveChangesModal={showConfirmSaveChangesModal}
-              setShowConfirmSaveChangesModal={setShowConfirmSaveChangesModal}
+        <>
+          <div className={`${baseClass}__header-links`}>
+            <BackLink
+              text={queryId ? "Back to report" : "Back to queries"}
+              path={backToQueriesPath()}
             />
           </div>
-        </div>
+          <EditQueryForm
+            router={router}
+            onSubmitNewQuery={onSubmitNewQuery}
+            onOsqueryTableSelect={onOsqueryTableSelect}
+            onUpdate={onUpdateQuery}
+            storedQuery={storedQuery}
+            queryIdForEdit={queryId}
+            apiTeamIdForQuery={apiTeamIdForQuery}
+            teamNameForQuery={teamNameForQuery}
+            isStoredQueryLoading={isStoredQueryLoading}
+            showOpenSchemaActionText={showOpenSchemaActionText}
+            onOpenSchemaSidebar={onOpenSchemaSidebar}
+            renderLiveQueryWarning={renderLiveQueryWarning}
+            backendValidators={backendValidators}
+            isQuerySaving={isQuerySaving}
+            isQueryUpdating={isQueryUpdating}
+            hostId={parseInt(location.query.host_ids as string, 10)}
+            queryReportsDisabled={
+              appConfig?.server_settings.query_reports_disabled
+            }
+            showConfirmSaveChangesModal={showConfirmSaveChangesModal}
+            setShowConfirmSaveChangesModal={setShowConfirmSaveChangesModal}
+          />
+        </>
       </MainContent>
       {showSidebar && (
         <SidePanelContent>