diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx
index 0fe6af285b..3bd79f0c94 100644
--- a/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Configuration/General/Fields.tsx
@@ -186,7 +186,7 @@ function Fields(props: Props) {
         />
         <SwitchFE
           name="leapYear"
-          sx={{ flex: 1, flexBasis: "100%" }}
+          sx={{ flexBasis: "100%" }}
           label={t("study.configuration.general.leapYear")}
           control={control}
           rules={{
diff --git a/webapp/src/components/App/Singlestudy/explore/Configuration/index.tsx b/webapp/src/components/App/Singlestudy/explore/Configuration/index.tsx
index cc4d673cdd..96bc285952 100644
--- a/webapp/src/components/App/Singlestudy/explore/Configuration/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Configuration/index.tsx
@@ -1,4 +1,3 @@
-import { Paper } from "@mui/material";
 import * as R from "ramda";
 import { useMemo, useState } from "react";
 import { useOutletContext } from "react-router";
@@ -13,6 +12,7 @@ import Optimization from "./Optimization";
 import TimeSeriesManagement from "./TimeSeriesManagement";
 import TableMode from "../../../../common/TableMode";
 import SplitView from "../../../../common/SplitView";
+import ViewWrapper from "../../../../common/page/ViewWrapper";
 
 function Configuration() {
   const { study } = useOutletContext<{ study: StudyMetadata }>();
@@ -40,6 +40,7 @@ function Configuration() {
 
   return (
     <SplitView id="configuration" sizes={[15, 85]}>
+      {/* Left */}
       <PropertiesView
         mainContent={
           <ListElement
@@ -51,8 +52,8 @@ function Configuration() {
           />
         }
       />
-
-      <Paper sx={{ width: 1, height: 1, padding: 2, overflow: "auto" }}>
+      {/* Right */}
+      <ViewWrapper>
         {R.cond([
           [R.equals(0), () => <General />],
           [R.equals(1), () => <TimeSeriesManagement />],
@@ -108,7 +109,7 @@ function Configuration() {
             ),
           ],
         ])(tabList[currentTabIndex].id)}
-      </Paper>
+      </ViewWrapper>
     </SplitView>
   );
 }