diff --git a/src/renderer/components/segmented-control/index.tsx b/src/renderer/components/segmented-control/index.tsx
index aaf4b1205..1475f97a1 100644
--- a/src/renderer/components/segmented-control/index.tsx
+++ b/src/renderer/components/segmented-control/index.tsx
@@ -19,6 +19,10 @@ const StyledSegmentedControl = styled(
   & .mantine-SegmentedControl-label {
     font-family: var(--label-font-family);
   }
+
+  &:disabled {
+    cursor: default;
+  }
 `;
 
 export const SegmentedControl = forwardRef<
diff --git a/src/renderer/components/switch/index.tsx b/src/renderer/components/switch/index.tsx
index 4665689ea..e602af05d 100644
--- a/src/renderer/components/switch/index.tsx
+++ b/src/renderer/components/switch/index.tsx
@@ -7,6 +7,8 @@ import styled from 'styled-components';
 type SwitchProps = MantineSwitchProps;
 
 const StyledSwitch = styled(MantineSwitch)`
+  display: flex;
+
   & .mantine-Switch-track {
     background-color: var(--switch-track-bg);
   }