diff --git a/src/components/DeviceListTable.tsx b/src/components/DeviceListTable.tsx
index 70872f5903..f769dc5e81 100644
--- a/src/components/DeviceListTable.tsx
+++ b/src/components/DeviceListTable.tsx
@@ -63,7 +63,7 @@ const DeviceListTable: FC<Props> = ({ configBaseURL, devices }) => {
       }
 
       if (isHostDiskDevice(device)) {
-        deviceType += " (host)";
+        deviceType += " (host path)";
       }
     }
 
diff --git a/src/components/forms/DiskDeviceFormCustom.tsx b/src/components/forms/DiskDeviceFormCustom.tsx
index 919e9b0350..280d8d4dca 100644
--- a/src/components/forms/DiskDeviceFormCustom.tsx
+++ b/src/components/forms/DiskDeviceFormCustom.tsx
@@ -22,7 +22,7 @@ import {
   isRootDisk,
 } from "util/instanceValidation";
 import { ensureEditMode } from "util/instanceEdit";
-import { getExistingDeviceNames, isVolumeDevice } from "util/devices";
+import { getExistingDeviceNames, isVolume, isVolumeDevice } from "util/devices";
 import { LxdProfile } from "types/profile";
 import { focusField } from "util/formFields";
 import AttachDiskDeviceBtn from "pages/storage/AttachDiskDeviceBtn";
@@ -40,13 +40,12 @@ const DiskDeviceFormCustom: FC<Props> = ({ formik, project, profiles }) => {
 
   const addDiskDevice = (device: LxdStorageVolume | LxdDiskDevice) => {
     const copy = [...formik.values.devices];
-    const isVolume = "content_type" in device;
     const newDevice: FormDevice = {
       type: "disk",
       name: deduplicateName("disk-device", 1, existingDeviceNames),
     };
 
-    if (isVolume) {
+    if (isVolume(device)) {
       newDevice.pool = device.pool;
       newDevice.source = device.name;
       newDevice.path = device.content_type === "filesystem" ? "" : undefined;
@@ -67,8 +66,7 @@ const DiskDeviceFormCustom: FC<Props> = ({ formik, project, profiles }) => {
     formDiskDevice: FormDiskDevice,
     index: number,
   ) => {
-    const isVolume = "content_type" in diskDevice;
-    if (isVolume) {
+    if (isVolume(diskDevice)) {
       void formik.setFieldValue(`devices.${index}.pool`, diskDevice.pool);
       void formik.setFieldValue(`devices.${index}.source`, diskDevice.name);
 
@@ -81,12 +79,10 @@ const DiskDeviceFormCustom: FC<Props> = ({ formik, project, profiles }) => {
       if (diskDevice.content_type === "block") {
         void formik.setFieldValue(`devices.${index}.path`, undefined);
       }
-
-      return;
+    } else {
+      void formik.setFieldValue(`devices.${index}.source`, diskDevice.source);
+      void formik.setFieldValue(`devices.${index}.path`, diskDevice.path);
     }
-
-    void formik.setFieldValue(`devices.${index}.source`, diskDevice.source);
-    void formik.setFieldValue(`devices.${index}.path`, diskDevice.path);
   };
 
   const editButton = (fieldName: string) => (
@@ -138,75 +134,79 @@ const DiskDeviceFormCustom: FC<Props> = ({ formik, project, profiles }) => {
       }),
     );
 
-    const volumeDeviceSource = getConfigurationRowBase({
-      className: "no-border-top inherited-with-form",
-      configuration: (
-        <Label forId={`devices.${index}.pool`}>Pool / volume</Label>
-      ),
-      inherited: (
-        <div className="custom-disk-volume-source">
-          <div
-            className={classnames("mono-font", "u-truncate")}
-            title={`${item.pool} / ${item.source ?? ""}`}
-          >
-            <b>
-              {item.pool} / {item.source}
-            </b>
+    const volumeDeviceSource = () =>
+      getConfigurationRowBase({
+        className: "no-border-top inherited-with-form",
+        configuration: (
+          <Label forId={`devices.${index}.pool`}>Pool / volume</Label>
+        ),
+        inherited: (
+          <div className="custom-disk-volume-source">
+            <div
+              className={classnames("mono-font", "u-truncate")}
+              title={`${item.pool} / ${item.source ?? ""}`}
+            >
+              <b>
+                {item.pool} / {item.source}
+              </b>
+            </div>
+            <CustomVolumeSelectBtn
+              formik={formik}
+              project={project}
+              setValue={(volume) => {
+                ensureEditMode(formik);
+                changeDiskDevice(volume, item, index);
+              }}
+              buttonProps={{
+                id: `devices.${index}.pool`,
+                appearance: "base",
+                className: "u-no-margin--bottom",
+                title: "Select storage volume",
+                dense: true,
+              }}
+            >
+              <Icon name="edit" />
+            </CustomVolumeSelectBtn>
           </div>
-          <CustomVolumeSelectBtn
-            formik={formik}
-            project={project}
-            setValue={(volume) => {
-              ensureEditMode(formik);
-              changeDiskDevice(volume, item, index);
-            }}
-            buttonProps={{
-              id: `devices.${index}.pool`,
-              appearance: "base",
-              className: "u-no-margin--bottom",
-              title: "Select storage volume",
-              dense: true,
-            }}
-          >
-            <Icon name="edit" />
-          </CustomVolumeSelectBtn>
-        </div>
-      ),
-      override: "",
-    });
+        ),
+        override: "",
+      });
 
-    const hostDeviceSource = getConfigurationRowBase({
-      className: "no-border-top inherited-with-form",
-      configuration: <Label forId={`devices.${index}.source`}>Host path</Label>,
-      inherited: readOnly ? (
-        <div className="custom-disk-read-mode">
-          <div className="mono-font custom-disk-value u-truncate">
-            <b>{item.source}</b>
+    const hostDeviceSource = () =>
+      getConfigurationRowBase({
+        className: "no-border-top inherited-with-form",
+        configuration: (
+          <Label forId={`devices.${index}.source`}>Host path</Label>
+        ),
+        inherited: readOnly ? (
+          <div className="custom-disk-read-mode">
+            <div className="mono-font custom-disk-value u-truncate">
+              <b>{item.source}</b>
+            </div>
+            {editButton(`devices.${index}.source`)}
           </div>
-          {editButton(`devices.${index}.source`)}
-        </div>
-      ) : (
-        <Input
-          id={`devices.${index}.source`}
-          name={`devices.${index}.source`}
-          onBlur={formik.handleBlur}
-          onChange={(e) => {
-            void formik.setFieldValue(
-              `devices.${index}.source`,
-              e.target.value,
-            );
-          }}
-          value={item.source}
-          type="text"
-          placeholder="Enter full host path (e.g. /data)"
-          className={!item.source ? undefined : "u-no-margin--bottom"}
-          error={!item.source ? "Host path is required" : undefined}
-        />
-      ),
-      override: "",
-    });
+        ) : (
+          <Input
+            id={`devices.${index}.source`}
+            name={`devices.${index}.source`}
+            onBlur={formik.handleBlur}
+            onChange={(e) => {
+              void formik.setFieldValue(
+                `devices.${index}.source`,
+                e.target.value,
+              );
+            }}
+            value={item.source}
+            type="text"
+            placeholder="Enter full host path (e.g. /data)"
+            className={!item.source ? undefined : "u-no-margin--bottom"}
+            error={!item.source ? "Host path is required" : undefined}
+          />
+        ),
+        override: "",
+      });
 
-    rows.push(isVolumeDevice(item) ? volumeDeviceSource : hostDeviceSource);
+    rows.push(isVolumeDevice(item) ? volumeDeviceSource() : hostDeviceSource());
 
     if (!isVolumeDevice(item) || item.path !== undefined) {
       const hasError = isDiskDeviceMountPointMissing(formik, index);
diff --git a/src/pages/instances/actions/DetachDiskDeviceBtn.tsx b/src/pages/instances/actions/DetachDiskDeviceBtn.tsx
index 93f46d38ec..86bbb01b96 100644
--- a/src/pages/instances/actions/DetachDiskDeviceBtn.tsx
+++ b/src/pages/instances/actions/DetachDiskDeviceBtn.tsx
@@ -10,10 +10,10 @@ const DetachDiskDeviceBtn: FC<Props> = ({ onDetach }) => {
     <ConfirmationButton
       appearance="base"
       type="button"
-      title="Detach disk devicve"
+      title="Detach disk"
       className="has-icon u-no-margin--bottom is-dense"
       confirmationModalProps={{
-        title: "Confirm disk device detach",
+        title: "Confirm disk detachment",
         children: (
           <p>
             Are you sure you want to clear this disk attachment?
diff --git a/src/pages/storage/AttachDiskDeviceModal.tsx b/src/pages/storage/AttachDiskDeviceModal.tsx
index 43d4ea0892..d467a0d4ba 100644
--- a/src/pages/storage/AttachDiskDeviceModal.tsx
+++ b/src/pages/storage/AttachDiskDeviceModal.tsx
@@ -8,7 +8,7 @@ import { LxdStorageVolume } from "types/storage";
 import { LxdDiskDevice } from "types/device";
 import HostPathDeviceModal from "./HostPathDeviceModal";
 
-type DiskDeviceType = "custom volume" | "host path" | "";
+type DiskDeviceType = "custom volume" | "host path" | "choose type";
 
 interface Props {
   close: () => void;
@@ -23,7 +23,7 @@ const AttachDiskDeviceModal: FC<Props> = ({
   project,
   onFinish,
 }) => {
-  const [type, setType] = useState<DiskDeviceType>("");
+  const [type, setType] = useState<DiskDeviceType>("choose type");
 
   const handleEscKey = (e: KeyboardEvent<HTMLElement>) => {
     if (e.key === "Escape") {
@@ -32,45 +32,42 @@ const AttachDiskDeviceModal: FC<Props> = ({
   };
 
   const handleGoBack = () => {
-    if (type) {
-      setType("");
-      return;
-    }
+    setType("choose type");
+    return;
   };
 
-  const modalTitle = !type ? (
-    "Choose disk device type"
-  ) : (
-    <BackLink
-      title={`Attach ${type} device`}
-      onClick={handleGoBack}
-      linkText={"Choose disk device type"}
-    />
-  );
+  const modalTitle =
+    type === "choose type" ? (
+      "Choose disk type"
+    ) : (
+      <BackLink
+        title={`Attach ${type}`}
+        onClick={handleGoBack}
+        linkText="Choose disk type"
+      />
+    );
 
   return (
     <>
-      {!type && (
+      {type === "choose type" && (
         <Modal
           close={close}
           className="migrate-instance-modal"
           title={modalTitle}
           onKeyDown={handleEscKey}
         >
-          {!type && (
-            <div className="choose-migration-type">
-              <FormLink
-                icon="add-logical-volume"
-                title="Attach custom volume device"
-                onClick={() => setType("custom volume")}
-              />
-              <FormLink
-                icon="mount"
-                title="Attach host path device"
-                onClick={() => setType("host path")}
-              />
-            </div>
-          )}
+          <div className="choose-migration-type">
+            <FormLink
+              icon="add-logical-volume"
+              title="Attach custom volume"
+              onClick={() => setType("custom volume")}
+            />
+            <FormLink
+              icon="mount"
+              title="Mount host path"
+              onClick={() => setType("host path")}
+            />
+          </div>
         </Modal>
       )}
 
@@ -80,6 +77,7 @@ const AttachDiskDeviceModal: FC<Props> = ({
           project={project}
           onFinish={onFinish}
           onCancel={handleGoBack}
+          onClose={close}
           title={modalTitle}
         />
       )}
@@ -89,6 +87,7 @@ const AttachDiskDeviceModal: FC<Props> = ({
           formik={formik}
           onFinish={onFinish}
           onCancel={handleGoBack}
+          onClose={close}
           title={modalTitle}
         />
       )}
diff --git a/src/pages/storage/CustomVolumeCreateModal.tsx b/src/pages/storage/CustomVolumeCreateModal.tsx
index c4705b93e2..dbec2d5b06 100644
--- a/src/pages/storage/CustomVolumeCreateModal.tsx
+++ b/src/pages/storage/CustomVolumeCreateModal.tsx
@@ -117,7 +117,7 @@ const CustomVolumeCreateModal: FC<Props> = ({
           className="u-no-margin--bottom"
           onClick={onCancel}
         >
-          Cancel
+          Back
         </Button>
         <ActionButton
           appearance="positive"
diff --git a/src/pages/storage/CustomVolumeModal.tsx b/src/pages/storage/CustomVolumeModal.tsx
index 38da21e384..0bca04fe4a 100644
--- a/src/pages/storage/CustomVolumeModal.tsx
+++ b/src/pages/storage/CustomVolumeModal.tsx
@@ -12,6 +12,7 @@ interface Props {
   project: string;
   onFinish: (volume: LxdStorageVolume) => void;
   onCancel: () => void;
+  onClose: () => void;
   title?: ReactNode;
 }
 
@@ -23,6 +24,7 @@ const CustomVolumeModal: FC<Props> = ({
   project,
   onFinish,
   onCancel,
+  onClose,
   title,
 }) => {
   const [content, setContent] = useState(SELECT_VOLUME);
@@ -45,9 +47,9 @@ const CustomVolumeModal: FC<Props> = ({
   if (content === CREATE_VOLUME) {
     modalTitle = title ? (
       <BackLink
-        title={"Create volume"}
+        title="Create volume"
         onClick={handleGoBack}
-        linkText={"Attach custom volume device"}
+        linkText="Attach custom volume"
       />
     ) : (
       "Create volume"
@@ -55,7 +57,7 @@ const CustomVolumeModal: FC<Props> = ({
   }
 
   return (
-    <Modal className="custom-volume-modal" close={onCancel} title={modalTitle}>
+    <Modal className="custom-volume-modal" close={onClose} title={modalTitle}>
       {content === SELECT_VOLUME && (
         <CustomVolumeSelectModal
           project={project}
@@ -64,6 +66,7 @@ const CustomVolumeModal: FC<Props> = ({
           onFinish={onFinish}
           onCancel={onCancel}
           onCreate={() => setContent(CREATE_VOLUME)}
+          hasPrevStep={!!title}
         />
       )}
       {content === CREATE_VOLUME && (
diff --git a/src/pages/storage/CustomVolumeSelectBtn.tsx b/src/pages/storage/CustomVolumeSelectBtn.tsx
index e331ca7a6e..4f46b3f3f4 100644
--- a/src/pages/storage/CustomVolumeSelectBtn.tsx
+++ b/src/pages/storage/CustomVolumeSelectBtn.tsx
@@ -22,8 +22,6 @@ const CustomVolumeSelectBtn: FC<Props> = ({
 }) => {
   const { openPortal, closePortal, isOpen, Portal } = usePortal();
 
-  const handleCancel = () => closePortal();
-
   const handleFinish = (volume: LxdStorageVolume) => {
     setValue(volume);
     closePortal();
@@ -40,7 +38,8 @@ const CustomVolumeSelectBtn: FC<Props> = ({
             formik={formik}
             project={project}
             onFinish={handleFinish}
-            onCancel={handleCancel}
+            onCancel={closePortal}
+            onClose={closePortal}
           />
         </Portal>
       )}
diff --git a/src/pages/storage/CustomVolumeSelectModal.tsx b/src/pages/storage/CustomVolumeSelectModal.tsx
index dfde433e41..8897389e32 100644
--- a/src/pages/storage/CustomVolumeSelectModal.tsx
+++ b/src/pages/storage/CustomVolumeSelectModal.tsx
@@ -18,6 +18,7 @@ interface Props {
   onFinish: (volume: LxdStorageVolume) => void;
   onCancel: () => void;
   onCreate: () => void;
+  hasPrevStep?: boolean;
 }
 
 const CustomVolumeSelectModal: FC<Props> = ({
@@ -27,6 +28,7 @@ const CustomVolumeSelectModal: FC<Props> = ({
   onFinish,
   onCancel,
   onCreate,
+  hasPrevStep,
 }) => {
   const notify = useNotify();
   const { hasStorageVolumesAll } = useSupportedFeatures();
@@ -186,7 +188,7 @@ const CustomVolumeSelectModal: FC<Props> = ({
             onClick={onCancel}
             appearance="base"
           >
-            Cancel
+            {hasPrevStep ? "Back" : "Cancel"}
           </Button>
           <Button
             className="u-no-margin--bottom"
diff --git a/src/pages/storage/HostPathDeviceModal.tsx b/src/pages/storage/HostPathDeviceModal.tsx
index 78223a64ec..d00bed90d4 100644
--- a/src/pages/storage/HostPathDeviceModal.tsx
+++ b/src/pages/storage/HostPathDeviceModal.tsx
@@ -1,12 +1,14 @@
-import { FC, ReactNode, useRef, useState } from "react";
+import { FC, ReactNode, useEffect, useRef, useState } from "react";
 import { Button, Input, Modal } from "@canonical/react-components";
 import { InstanceAndProfileFormikProps } from "components/forms/instanceAndProfileFormValues";
 import { LxdDiskDevice } from "types/device";
+import { focusField } from "util/formFields";
 
 interface Props {
   formik: InstanceAndProfileFormikProps;
   onFinish: (device: LxdDiskDevice) => void;
   onCancel: () => void;
+  onClose: () => void;
   title?: ReactNode;
 }
 
@@ -14,15 +16,20 @@ const HostPathDeviceModal: FC<Props> = ({
   formik,
   onFinish,
   onCancel,
+  onClose,
   title,
 }) => {
   const [source, setSource] = useState("");
-  const [path, setPath] = useState<string>();
+  const [path, setPath] = useState("");
   const touchedRef = useRef({
     source: false,
     path: false,
   });
 
+  useEffect(() => {
+    focusField("host-path");
+  }, []);
+
   const handleFinish = () => {
     const device: LxdDiskDevice = {
       type: "disk",
@@ -36,7 +43,7 @@ const HostPathDeviceModal: FC<Props> = ({
   return (
     <Modal
       className="host-path-device-modal"
-      close={onCancel}
+      close={onClose}
       title={title}
       buttonRow={
         <>
@@ -46,7 +53,7 @@ const HostPathDeviceModal: FC<Props> = ({
             type="button"
             onClick={onCancel}
           >
-            Cancel
+            Back
           </Button>
           <Button
             appearance=""
@@ -62,6 +69,7 @@ const HostPathDeviceModal: FC<Props> = ({
       }
     >
       <Input
+        id="host-path"
         value={source}
         onChange={(e) => {
           touchedRef.current.source = true;
@@ -75,6 +83,7 @@ const HostPathDeviceModal: FC<Props> = ({
             ? "Host path is required"
             : undefined
         }
+        placeholder="Enter full path (e.g. /home)"
       />
       <Input
         value={path}
@@ -90,6 +99,7 @@ const HostPathDeviceModal: FC<Props> = ({
             ? "Mount point is required"
             : undefined
         }
+        placeholder="Enter full path (e.g. /data)"
       />
     </Modal>
   );
diff --git a/src/util/devices.tsx b/src/util/devices.tsx
index 769b596aae..2e25890522 100644
--- a/src/util/devices.tsx
+++ b/src/util/devices.tsx
@@ -10,6 +10,7 @@ import {
 import { LxdProfile } from "types/profile";
 import { FormDevice, FormDiskDevice } from "util/formDevices";
 import { getAppliedProfiles } from "./configInheritance";
+import { LxdStorageVolume } from "types/storage";
 
 export const isNicDevice = (device: LxdDeviceValue): device is LxdNicDevice =>
   device.type === "nic";
@@ -110,3 +111,9 @@ export const getExistingDeviceNames = (
 
   return existingDeviceNames;
 };
+
+export const isVolume = (
+  device: LxdStorageVolume | LxdDiskDevice,
+): device is LxdStorageVolume => {
+  return "content_type" in device;
+};
diff --git a/src/util/helpers.tsx b/src/util/helpers.tsx
index a88e71c7b7..6a4b79ed6c 100644
--- a/src/util/helpers.tsx
+++ b/src/util/helpers.tsx
@@ -333,5 +333,5 @@ export const getDefaultStoragePool = (profile: LxdProfile) => {
     .find((device) => {
       return isRootDisk(device as FormDevice);
     });
-  return rootStorage ? (rootStorage.pool ?? "") : "";
+  return rootStorage?.pool ?? "";
 };
diff --git a/tests/helpers/devices.ts b/tests/helpers/devices.ts
index 0da1def063..5e21cdcbdc 100644
--- a/tests/helpers/devices.ts
+++ b/tests/helpers/devices.ts
@@ -7,9 +7,7 @@ export const attachVolume = async (
   path: string,
 ) => {
   await page.getByRole("button", { name: "Attach disk device" }).click();
-  await page
-    .getByRole("button", { name: "Attach custom volume device" })
-    .click();
+  await page.getByRole("button", { name: "Attach custom volume" }).click();
   await page.getByRole("button", { name: "Create volume" }).click();
   await page.getByPlaceholder("Enter name").fill(volume);
   await page.getByRole("button", { name: "Create volume" }).click();
@@ -23,10 +21,10 @@ export const attachHostPath = async (
   path: string,
 ) => {
   await page.getByRole("button", { name: "Attach disk device" }).click();
-  await page.getByRole("button", { name: "Attach host path device" }).click();
+  await page.getByRole("button", { name: "Mount host path" }).click();
   await page.getByLabel("Host path", { exact: true }).click();
   await page.getByLabel("Host path", { exact: true }).fill(source);
-  const hostPathModal = page.getByLabel("Choose disk device type /");
+  const hostPathModal = page.getByLabel("Choose disk type /");
   await hostPathModal.getByLabel("Mount point").click();
   await hostPathModal.getByLabel("Mount point").fill(path);
   await page.getByRole("button", { name: "Attach", exact: true }).click();
@@ -38,7 +36,7 @@ export const detachDiskDevice = async (page: Page, volumeDevice: string) => {
     .getByTitle("Detach")
     .click();
   await page
-    .getByLabel("Confirm disk device detach")
+    .getByLabel("Confirm disk detachment")
     .getByRole("button", { name: "Detach" })
     .click();
 };