diff --git a/EditSets.tsx b/EditSets.tsx
index 643b9c8..11cb127 100644
--- a/EditSets.tsx
+++ b/EditSets.tsx
@@ -19,6 +19,7 @@ import { DrawerParams } from "./drawer-param-list";
 import GymSet from "./gym-set";
 import Settings from "./settings";
 import StackHeader from "./StackHeader";
+import Select from "./Select";
 
 export default function EditSets() {
   const { params } = useRoute<RouteProp<StackParams, "EditSets">>();
@@ -144,11 +145,15 @@ export default function EditSets() {
         </View>
 
         {settings.showUnit && (
-          <AppInput
-            autoCapitalize="none"
-            label={`Units: ${units}`}
+          <Select
             value={unit}
-            onChangeText={setUnit}
+            onChange={setUnit}
+            items={[
+              { label: "kg", value: "kg" },
+              { label: "lb", value: "lb" },
+              { label: "stone", value: "stone" },
+            ]}
+            label={`Units: ${units}`}
           />
         )}
 
diff --git a/EditWeight.tsx b/EditWeight.tsx
index 20ab4b0..bd599fe 100644
--- a/EditWeight.tsx
+++ b/EditWeight.tsx
@@ -21,6 +21,7 @@ import Settings from "./settings";
 import StackHeader from "./StackHeader";
 import { toast } from "./toast";
 import Weight from "./weight";
+import Select from "./Select";
 
 export default function EditWeight() {
   const { params } = useRoute<RouteProp<StackParams, "EditWeight">>();
@@ -127,12 +128,15 @@ export default function EditWeight() {
         />
 
         {settings.showUnit && (
-          <AppInput
-            autoCapitalize="none"
-            label="Unit"
+          <Select
             value={unit}
-            onChangeText={setUnit}
-            innerRef={unitRef}
+            onChange={setUnit}
+            items={[
+              { label: "kg", value: "kg" },
+              { label: "lb", value: "lb" },
+              { label: "stone", value: "stone" },
+            ]}
+            label="Unit"
           />
         )}
 
diff --git a/StartPlan.tsx b/StartPlan.tsx
index e6f68ec..4a0553e 100644
--- a/StartPlan.tsx
+++ b/StartPlan.tsx
@@ -22,6 +22,7 @@ import StackHeader from "./StackHeader";
 import StartPlanItem from "./StartPlanItem";
 import { toast } from "./toast";
 import { PERMISSIONS, RESULTS, check, request } from "react-native-permissions";
+import Select from "./Select";
 
 export default function StartPlan() {
   const { params } = useRoute<RouteProp<StackParams, "StartPlan">>();
@@ -33,7 +34,6 @@ export default function StartPlan() {
   const [counts, setCounts] = useState<CountMany[]>();
   const weightRef = useRef<TextInput>(null);
   const repsRef = useRef<TextInput>(null);
-  const unitRef = useRef<TextInput>(null);
   const exercises = useMemo(() => params.plan.exercises.split(","), [params]);
   const navigation = useNavigation<NavigationProp<StackParams>>();
 
@@ -193,12 +193,15 @@ export default function StartPlan() {
           </View>
 
           {settings?.showUnit && (
-            <AppInput
-              autoCapitalize="none"
-              label="Unit"
+            <Select
               value={unit}
-              onChangeText={setUnit}
-              innerRef={unitRef}
+              onChange={setUnit}
+              items={[
+                { label: "kg", value: "kg" },
+                { label: "lb", value: "lb" },
+                { label: "stone", value: "stone" },
+              ]}
+              label="Unit"
             />
           )}
           {counts && (
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 49711b6..ec3438a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -85,8 +85,8 @@ android {
         applicationId "com.massive"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36208
-        versionName "1.182"
+        versionCode 36209
+        versionName "1.183"
     }
     signingConfigs {
         release {
diff --git a/package.json b/package.json
index 59d0f29..47f6ddc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "massive",
-  "version": "1.182",
+  "version": "1.183",
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {