diff --git a/frontend/src/Editor/Components/Table/CustomSelect.jsx b/frontend/src/Editor/Components/Table/CustomSelect.jsx
index ec15e35a09..16903bff05 100644
--- a/frontend/src/Editor/Components/Table/CustomSelect.jsx
+++ b/frontend/src/Editor/Components/Table/CustomSelect.jsx
@@ -4,17 +4,21 @@ import SelectSearch from 'react-select-search';
 export const CustomSelect = ({ options, value, multiple, disabled, onChange }) => {
  
     function renderValue(valueProps) {
-        return <span {...valueProps} class="badge bg-blue-lt p-2">{valueProps.value}</span>
+        if(valueProps) {
+            return valueProps.value.split(', ').map((value) => <span {...valueProps} class="badge bg-blue-lt p-2 mx-1">{value}</span>);
+        }
     }
 
     return (
         <div class="custom-select">
             <SelectSearch
                 options={options}
+                printOptions="on-focus"
                 value={value}
                 renderValue={renderValue}
-                search={true}
+                search={false}
                 onChange={onChange}
+                multiple={multiple}
                 placeholder="Select.."
             />
         </div>
diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
index f4575c97d2..deb9e53a50 100644
--- a/frontend/src/Editor/Components/Table/Table.jsx
+++ b/frontend/src/Editor/Components/Table/Table.jsx
@@ -217,7 +217,7 @@ export function Table({
     const columnType = column.columnType;
 
     const columnOptions = {};
-    if (columnType === 'dropdown' || columnType === 'multiselect' || columnType === 'badge') {
+    if (columnType === 'dropdown' || columnType === 'multiselect' || columnType === 'badge' || columnType === 'badges') {
       const values = resolveReferences(column.values, currentState) || [];
       const labels = resolveReferences(column.labels, currentState, []) || [];
 
@@ -302,6 +302,19 @@ export function Table({
               />
             </div>
           );
+        } if (columnType === 'badges') {
+          return (
+            <div>
+              <CustomSelect
+                options={columnOptions.selectOptions}
+                value={cellValue}
+                multiple={true}
+                onChange={(value) => {
+                  handleCellValueChange(cell.row.index, column.key || column.name, value, cell.row.original);
+                }}
+              />
+            </div>
+          );
         }
         return cellValue || '';
       }
diff --git a/frontend/src/Editor/Inspector/Components/Table.jsx b/frontend/src/Editor/Inspector/Components/Table.jsx
index ba408b8a85..41c575660d 100644
--- a/frontend/src/Editor/Inspector/Components/Table.jsx
+++ b/frontend/src/Editor/Inspector/Components/Table.jsx
@@ -97,6 +97,7 @@ class Table extends React.Component {
                 { name: 'Default', value: 'default' },
                 { name: 'String', value: 'string' },
                 { name: 'Badge', value: 'badge' },
+                { name: 'Multiple badges', value: 'badges' },
                 { name: 'Dropdown', value: 'dropdown' },
                 { name: 'Multiselect', value: 'multiselect' }
               ]}
@@ -135,7 +136,7 @@ class Table extends React.Component {
             />
           </div>
 
-          {(column.columnType === 'dropdown' || column.columnType === 'multiselect' || column.columnType === 'badge') && (
+          {(column.columnType === 'dropdown' || column.columnType === 'multiselect' || column.columnType === 'badge' || column.columnType === 'badges') && (
             <div>
               <div className="field mb-2">
                 <label className="form-label">Values</label>