diff --git a/services/frontend/src/components/Modal/volume/CreateVolumeModal.tsx b/services/frontend/src/components/Modal/volume/CreateVolumeModal.tsx
index 951dcc0..a15868d 100644
--- a/services/frontend/src/components/Modal/volume/CreateVolumeModal.tsx
+++ b/services/frontend/src/components/Modal/volume/CreateVolumeModal.tsx
@@ -13,6 +13,7 @@ import { CallbackFunction, IEditVolumeForm } from "../../../types";
 import { classNames } from "../../../utils/styles";
 import { toaster } from "../../../utils";
 import { reportErrorsAndSubmit } from "../../../utils/forms";
+import { ScrollView } from "../../ScrollView";
 
 interface ICreateVolumeModalProps {
   onHide: CallbackFunction;
@@ -90,9 +91,12 @@ const CreateVolumeModal = (props: ICreateVolumeModalProps) => {
                     </nav>
                   </div>
 
-                  <div className="relative px-4 py-3 flex-auto">
+                  <ScrollView
+                    height="500px"
+                    className="relative px-4 py-3 flex-auto"
+                  >
                     {openTab === "General" && <General />}
-                  </div>
+                  </ScrollView>
 
                   <div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
                     <button
diff --git a/services/frontend/src/components/Modal/volume/EditVolumeModal.tsx b/services/frontend/src/components/Modal/volume/EditVolumeModal.tsx
index 215245c..ec4edee 100644
--- a/services/frontend/src/components/Modal/volume/EditVolumeModal.tsx
+++ b/services/frontend/src/components/Modal/volume/EditVolumeModal.tsx
@@ -16,6 +16,7 @@ import {
 import { classNames } from "../../../utils/styles";
 import { toaster } from "../../../utils";
 import { reportErrorsAndSubmit } from "../../../utils/forms";
+import { ScrollView } from "../../ScrollView";
 
 interface IEditVolumeModal {
   node: IVolumeNodeItem;
@@ -103,9 +104,12 @@ const EditVolumeModal = (props: IEditVolumeModal) => {
                       </nav>
                     </div>
 
-                    <div className="relative px-4 py-3 flex-auto">
+                    <ScrollView
+                      height="500px"
+                      className="relative px-4 py-3 flex-auto"
+                    >
                       {openTab === "General" && <General />}
-                    </div>
+                    </ScrollView>
 
                     <div className="flex items-center justify-end px-4 py-3 border-t border-solid border-blueGray-200 rounded-b">
                       <button