diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/WebPreferences.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/WebPreferences.xml
index c018cfba10fc..efea3bfa09ea 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/WebPreferences.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/WebPreferences.xml
@@ -1333,10 +1333,10 @@
       <rightPanelsWidth>---</rightPanelsWidth>
     </property>
     <property>
-      <showLeftPanels>0</showLeftPanels>
+      <showLeftPanels/>
     </property>
     <property>
-      <showRightPanels>0</showRightPanels>
+      <showRightPanels/>
     </property>
     <property>
       <showannotations/>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml
index 645088983ecf..ea90d8f7e873 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml
@@ -322,6 +322,10 @@
 &lt;div class="row"&gt;
   #if($isEdit)
     #displayVariablesPanel()
+    ## Always hide both side panel columns
+    #set($showLeftPanels = "0")
+    #set($showRightPanels = "0")
+    &lt;script&gt;document.getElementById("body").classList.add("hidelefthideright");&lt;/script&gt;
   #else
     #displayHiddenVariables()
   #end