diff --git a/src/components/CANSelfServe/SelfServe/index.jsx b/src/components/CANSelfServe/SelfServe/index.jsx
index 4dbf59d..3de5740 100644
--- a/src/components/CANSelfServe/SelfServe/index.jsx
+++ b/src/components/CANSelfServe/SelfServe/index.jsx
@@ -72,9 +72,19 @@ const MainForm = ({ id }) => {
   };
 
   const handleSelectedItemsChange = (event) => {
-    setSelectedCanSignals(event.target.value);
+    const { value } = event.target;
+    if (value.some(item => item === "Select All")) {
+      if (selectedCanSignals.length === canSignals.length) {
+        setSelectedCanSignals([]);
+      } else {
+        setSelectedCanSignals(canSignals.map(signal => signal.signal_name));
+      }
+    } else {
+      setSelectedCanSignals(value);
+    }
   };
 
+
   return (
     <div className={classes.paper}>
       <Grid container spacing={3} justifyContent="center">
@@ -146,7 +156,7 @@ const MainForm = ({ id }) => {
         </Grid>
         <Grid item xs={12}>
           <FormControl fullWidth required>
-            <InputLabel id="select-can-signals-label">Select CAN signals</InputLabel>
+          <InputLabel id="select-can-signals-label">Select CAN signals</InputLabel>
             <Select
               labelId="select-can-signals-label"
               id="select-can-signals"
@@ -163,6 +173,10 @@ const MainForm = ({ id }) => {
                 </div>
               )}
             >
+              <MenuItem value="Select All">
+                <Checkbox checked={selectedCanSignals.length === canSignals.length} />
+                <ListItemText primary="Select All" />
+              </MenuItem>
               {canSignals.map((signal) => (
                 <MenuItem key={signal.signal_name} value={signal.signal_name}>
                   <Checkbox checked={selectedCanSignals.indexOf(signal.signal_name) > -1} />