diff --git a/src/js/components/Fields/Commands.js b/src/js/components/Fields/Commands.js
index 88ccb82f..e7a0554a 100644
--- a/src/js/components/Fields/Commands.js
+++ b/src/js/components/Fields/Commands.js
@@ -1,9 +1,86 @@
-import React, { useState, useEffect } from 'react';
-import { ReactSortable } from 'react-sortablejs';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { useDrop, useDrag } from 'react-dnd';
 import Icon from '../Icon';
 import Link from '../Link';
 import { sortItems, indexToArray } from '../../util/arrays';
 
+const DRAGGABLE_TYPE = 'COMMAND';
+
+const Command = ({
+  index,
+  onExecute,
+  onDrag,
+  onDragEnd,
+  command: {
+    id,
+    url,
+    name,
+    icon,
+    colour,
+  } = {},
+}) => {
+  const ref = useRef(null);
+
+  const [{ isDragging }, dragRef] = useDrag({
+    type: DRAGGABLE_TYPE,
+    item: { index },
+    collect: (monitor) => ({
+      isDragging: monitor.isDragging(),
+    }),
+    end: onDragEnd,
+  });
+
+  const [_dropProps, dropRef] = useDrop({
+    accept: DRAGGABLE_TYPE,
+    hover: (item, monitor) => {
+      const dragIndex = item.index;
+      const hoverIndex = index;
+      const hoverBoundingRect = ref.current?.getBoundingClientRect()
+      const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
+      const hoverActualY = monitor.getClientOffset().y - hoverBoundingRect.top;
+
+      // if dragging down, continue only when hover is smaller than middle Y
+      if (dragIndex < hoverIndex && hoverActualY < hoverMiddleY) return;
+      // if dragging up, continue only when hover is bigger than middle Y
+      if (dragIndex > hoverIndex && hoverActualY > hoverMiddleY) return;
+
+      onDrag(dragIndex, hoverIndex);
+      item.index = hoverIndex;
+    },
+  })
+
+  let className = 'list__item commands-setup__item';
+  if (isDragging) className += ' list__item--dragging';
+
+  return (
+    <div className={className} ref={dropRef(ref)}>
+      <div className="commands-setup__item__details">
+        <div ref={dragRef}>
+          <Icon
+            className="commands-setup__item__drag-handle"
+            name="drag_indicator"
+          />
+        </div>
+        <div className="commands-setup__item__command-item commands__item commands__item--small">
+          <Icon className="commands__item__icon" name={icon} />
+          <span className={`${colour}-background commands__item__background`} />
+        </div>
+        <div className="commands-setup__item__url commands__item__url">
+          {name || <span className="grey-text">{url}</span>}
+        </div>
+      </div>
+      <div className="commands-setup__item__actions">
+        <a className="commands-setup__item__run-button action" onClick={() => onExecute(id, true)}>
+          <Icon name="play_arrow" />
+        </a>
+        <Link className="commands-setup__item__edit-button action" to={`/modal/edit-command/${id}`}>
+          <Icon name="edit" />
+        </Link>
+      </div>
+    </div>
+  );
+}
+
 const Commands = ({
   commands,
   runCommand,
@@ -18,58 +95,44 @@ const Commands = ({
   useEffect(() => {
     setList(sortItems(indexToArray(commands), 'sort_order'));
   }, []);
-  
-  const onSort = () => {
-    const nextCommands = {};
-    if (!list || !list.length) return;
 
+  const onDrag = useCallback((dragIndex, hoverIndex) => {
+    setList((prev) => {
+      const next = [...prev];
+      const dragItem = next[dragIndex];
+      const hoverItem = next[hoverIndex];
+      next[dragIndex] = hoverItem;
+      next[hoverIndex] = dragItem;
+      return next;
+    });
+  }, [list]);
+
+  const onDragEnd = () => {
+    if (!list || !list.length) return;
+    const nextCommands = {};
     list.forEach((item, index) => {
       nextCommands[item.id] = {
         ...item,
         sort_order: index,
       };
     });
-
     onChange(nextCommands);
   };
 
   return (
-    <ReactSortable
-      options={{
-        handle: '.commands-setup__item__drag-handle',
-        animation: 150,
-      }}
-      className="list commands-setup"
-      list={list}
-      setList={setList}
-      onSort={onSort}
-    >
-      {
-        list.map((command) => (
-          <div className="list__item commands-setup__item list__item--no-interaction" key={command.id} data-id={command.id}>
-            <div className="commands-setup__item__details">
-              <Icon className="commands-setup__item__drag-handle" name="drag_indicator" />
-              <div className="commands-setup__item__command-item commands__item commands__item--small">
-                <Icon className="commands__item__icon" name={command.icon} />
-                <span className={`${command.colour}-background commands__item__background`} />
-              </div>
-              <div className="commands-setup__item__url commands__item__url">
-                {command.name ? command.name : <span className="grey-text">{command.url}</span>}
-              </div>
-            </div>
-            <div className="commands-setup__item__actions">
-              <a className="commands-setup__item__run-button action" onClick={() => runCommand(command.id, true)}>
-                <Icon name="play_arrow" />
-              </a>
-              <Link className="commands-setup__item__edit-button action" to={`/modal/edit-command/${command.id}`}>
-                <Icon name="edit" />
-              </Link>
-            </div>
-          </div>
-        ))
-      }
-    </ReactSortable>
+    <div className="commands-setup__item__drag-handle list commands-setup">
+      {list.map((command, index) => (
+        <Command
+          key={`command_${command.id}`}
+          index={index}
+          command={command}
+          onExecute={runCommand}
+          onDrag={onDrag}
+          onDragEnd={onDragEnd}
+        />
+      ))}
+    </div>
   );
-}
+};
 
 export default Commands;