diff --git a/app/features/comp-analyzer/components/SelectedWeapons.browser.test.tsx b/app/features/comp-analyzer/components/SelectedWeapons.browser.test.tsx
index 1a94d9335..4acbadaec 100644
--- a/app/features/comp-analyzer/components/SelectedWeapons.browser.test.tsx
+++ b/app/features/comp-analyzer/components/SelectedWeapons.browser.test.tsx
@@ -8,6 +8,7 @@ import { SelectedWeapons } from "./SelectedWeapons";
 const defaultProps: ComponentProps<typeof SelectedWeapons> = {
 	selectedWeaponIds: [],
 	onRemove: vi.fn(),
+	onReorder: vi.fn(),
 };
 
 function renderSelectedWeapons(
@@ -100,9 +101,7 @@ describe("SelectedWeapons", () => {
 				selectedWeaponIds: [0],
 			});
 
-			const removeButton = screen.getByRole("button", {
-				name: "Remove weapon",
-			});
+			const removeButton = screen.getByTestId("remove-weapon-0");
 			await expect.element(removeButton).toBeVisible();
 		});
 
diff --git a/app/features/comp-analyzer/components/SelectedWeapons.module.css b/app/features/comp-analyzer/components/SelectedWeapons.module.css
index 035001244..144e3bbfd 100644
--- a/app/features/comp-analyzer/components/SelectedWeapons.module.css
+++ b/app/features/comp-analyzer/components/SelectedWeapons.module.css
@@ -8,6 +8,11 @@
 	display: flex;
 	align-items: center;
 	gap: var(--s-2);
+	transition: opacity 0.2s;
+
+	&.isDragging {
+		opacity: 0.5;
+	}
 }
 
 .weaponImageContainer {
@@ -100,6 +105,28 @@
 	}
 }
 
+.dragHandle {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 20px;
+	height: 20px;
+	padding: 0;
+	background: none;
+	border: none;
+	font-size: var(--font-md);
+	line-height: 1;
+	color: var(--color-text-high);
+	cursor: grab;
+	user-select: none;
+	touch-action: none;
+	flex-shrink: 0;
+
+	&:active {
+		cursor: grabbing;
+	}
+}
+
 .subSpecialContainer {
 	display: flex;
 	gap: var(--s-2);
diff --git a/app/features/comp-analyzer/components/SelectedWeapons.tsx b/app/features/comp-analyzer/components/SelectedWeapons.tsx
index e511d53a8..35b7328d3 100644
--- a/app/features/comp-analyzer/components/SelectedWeapons.tsx
+++ b/app/features/comp-analyzer/components/SelectedWeapons.tsx
@@ -1,3 +1,20 @@
+import type { DragEndEvent } from "@dnd-kit/core";
+import {
+	closestCenter,
+	DndContext,
+	KeyboardSensor,
+	PointerSensor,
+	useSensor,
+	useSensors,
+} from "@dnd-kit/core";
+import {
+	SortableContext,
+	sortableKeyboardCoordinates,
+	useSortable,
+	verticalListSortingStrategy,
+} from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { Image, WeaponImage } from "~/components/Image";
 import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
@@ -13,81 +30,163 @@ import styles from "./SelectedWeapons.module.css";
 interface SelectedWeaponsProps {
 	selectedWeaponIds: MainWeaponId[];
 	onRemove: (index: number) => void;
+	onReorder: (newIds: MainWeaponId[]) => void;
 }
 
 export function SelectedWeapons({
 	selectedWeaponIds,
 	onRemove,
+	onReorder,
 }: SelectedWeaponsProps) {
 	const { t } = useTranslation(["weapons", "analyzer"]);
 
-	const slots = Array.from({ length: MAX_WEAPONS }, (_, i) => {
-		return selectedWeaponIds[i] ?? null;
-	});
+	const sensors = useSensors(
+		useSensor(PointerSensor),
+		useSensor(KeyboardSensor, {
+			coordinateGetter: sortableKeyboardCoordinates,
+		}),
+	);
+
+	const handleDragEnd = (event: DragEndEvent) => {
+		const { active, over } = event;
+
+		if (over && active.id !== over.id) {
+			const oldIndex = selectedWeaponIds.indexOf(active.id as MainWeaponId);
+			const newIndex = selectedWeaponIds.indexOf(over.id as MainWeaponId);
+
+			const newIds = [...selectedWeaponIds];
+			const [removed] = newIds.splice(oldIndex, 1);
+			newIds.splice(newIndex, 0, removed);
+
+			onReorder(newIds);
+		}
+	};
+
+	const emptySlotCount = MAX_WEAPONS - selectedWeaponIds.length;
+	const showDragHandle = selectedWeaponIds.length > 1;
 
 	return (
 		<div className={styles.selectedWeapons} data-testid="selected-weapons">
-			{slots.map((weaponId, index) => {
-				if (weaponId === null) {
-					return (
-						<div key={`empty-${index}`} className={styles.selectedWeaponRow}>
-							<div className={styles.weaponImageContainerEmpty}>
-								<Image path={abilityImageUrl("UNKNOWN")} alt="" size={48} />
-							</div>
-							<div className={styles.weaponNamePillEmpty}>
-								<span className={styles.weaponNameEmpty}>
-									{t("analyzer:comp.pickWeapon")}
-								</span>
-							</div>
-							<div className={styles.subSpecialContainerSpacer} />
-						</div>
-					);
-				}
-
-				const params = mainWeaponParams(weaponId);
-
-				return (
-					<div
-						key={index}
-						className={styles.selectedWeaponRow}
-						data-testid={`selected-weapon-${index}`}
-					>
-						<div className={styles.weaponImageContainer}>
-							<WeaponImage weaponSplId={weaponId} variant="build" size={48} />
-						</div>
-						<div className={styles.weaponNamePill}>
-							<span className={styles.weaponName}>
-								{t(`weapons:MAIN_${weaponId}`)}
-							</span>
-							<button
-								type="button"
-								className={styles.removeButton}
-								onClick={() => onRemove(index)}
-								aria-label={t("analyzer:comp.removeWeapon")}
-								data-testid={`remove-weapon-${index}`}
-							>
-								&times;
-							</button>
-						</div>
-						<div className={styles.subSpecialContainer}>
-							<div className={styles.kitIcon}>
-								<Image
-									path={subWeaponImageUrl(params.subWeaponId)}
-									alt={t(`weapons:SUB_${params.subWeaponId}`)}
-									size={24}
-								/>
-							</div>
-							<div className={styles.kitIcon}>
-								<Image
-									path={specialWeaponImageUrl(params.specialWeaponId)}
-									alt={t(`weapons:SPECIAL_${params.specialWeaponId}`)}
-									size={24}
-								/>
-							</div>
-						</div>
+			<DndContext
+				sensors={sensors}
+				collisionDetection={closestCenter}
+				onDragEnd={handleDragEnd}
+			>
+				<SortableContext
+					items={selectedWeaponIds}
+					strategy={verticalListSortingStrategy}
+				>
+					{selectedWeaponIds.map((weaponId, index) => (
+						<SortableWeaponRow
+							key={weaponId}
+							weaponId={weaponId}
+							index={index}
+							onRemove={onRemove}
+							showDragHandle={showDragHandle}
+						/>
+					))}
+				</SortableContext>
+			</DndContext>
+			{Array.from({ length: emptySlotCount }, (_, i) => (
+				<div key={`empty-${i}`} className={styles.selectedWeaponRow}>
+					<div className={styles.weaponImageContainerEmpty}>
+						<Image path={abilityImageUrl("UNKNOWN")} alt="" size={48} />
 					</div>
-				);
-			})}
+					<div className={styles.weaponNamePillEmpty}>
+						<span className={styles.weaponNameEmpty}>
+							{t("analyzer:comp.pickWeapon")}
+						</span>
+					</div>
+					<div className={styles.subSpecialContainerSpacer} />
+				</div>
+			))}
+		</div>
+	);
+}
+
+interface SortableWeaponRowProps {
+	weaponId: MainWeaponId;
+	index: number;
+	onRemove: (index: number) => void;
+	showDragHandle: boolean;
+}
+
+function SortableWeaponRow({
+	weaponId,
+	index,
+	onRemove,
+	showDragHandle,
+}: SortableWeaponRowProps) {
+	const { t } = useTranslation(["weapons", "analyzer"]);
+	const {
+		attributes,
+		listeners,
+		setNodeRef,
+		transform,
+		transition,
+		isDragging,
+	} = useSortable({ id: weaponId });
+
+	const style = {
+		transform: CSS.Transform.toString(transform),
+		transition,
+	};
+
+	const params = mainWeaponParams(weaponId);
+
+	return (
+		<div
+			ref={setNodeRef}
+			style={style}
+			className={clsx(styles.selectedWeaponRow, {
+				[styles.isDragging]: isDragging,
+			})}
+			data-testid={`selected-weapon-${index}`}
+			{...attributes}
+		>
+			<div className={styles.weaponImageContainer}>
+				<WeaponImage weaponSplId={weaponId} variant="build" size={48} />
+			</div>
+			<div className={styles.weaponNamePill}>
+				<span className={styles.weaponName}>
+					{t(`weapons:MAIN_${weaponId}`)}
+				</span>
+				{showDragHandle ? (
+					<button
+						type="button"
+						className={styles.dragHandle}
+						aria-label={t("analyzer:comp.reorderWeapon")}
+						{...listeners}
+					>
+						☰
+					</button>
+				) : null}
+				<button
+					type="button"
+					className={styles.removeButton}
+					onClick={() => onRemove(index)}
+					aria-label={t("analyzer:comp.removeWeapon")}
+					data-testid={`remove-weapon-${index}`}
+				>
+					&times;
+				</button>
+			</div>
+			<div className={styles.subSpecialContainer}>
+				<div className={styles.kitIcon}>
+					<Image
+						path={subWeaponImageUrl(params.subWeaponId)}
+						alt={t(`weapons:SUB_${params.subWeaponId}`)}
+						size={24}
+					/>
+				</div>
+				<div className={styles.kitIcon}>
+					<Image
+						path={specialWeaponImageUrl(params.specialWeaponId)}
+						alt={t(`weapons:SPECIAL_${params.specialWeaponId}`)}
+						size={24}
+					/>
+				</div>
+			</div>
 		</div>
 	);
 }
diff --git a/app/features/comp-analyzer/routes/comp-analyzer.tsx b/app/features/comp-analyzer/routes/comp-analyzer.tsx
index 19eee3712..e7b7ed91b 100644
--- a/app/features/comp-analyzer/routes/comp-analyzer.tsx
+++ b/app/features/comp-analyzer/routes/comp-analyzer.tsx
@@ -78,6 +78,7 @@ function CompAnalyzerPage() {
 			<SelectedWeapons
 				selectedWeaponIds={selectedWeaponIds}
 				onRemove={handleRemoveWeapon}
+				onReorder={setSelectedWeaponIds}
 			/>
 			<WeaponCategories selectedWeaponIds={selectedWeaponIds} />
 			<WeaponGrid
diff --git a/locales/da/analyzer.json b/locales/da/analyzer.json
index 354dc54f5..c391cc306 100644
--- a/locales/da/analyzer.json
+++ b/locales/da/analyzer.json
@@ -181,6 +181,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/de/analyzer.json b/locales/de/analyzer.json
index f4051aa45..e9a284e40 100644
--- a/locales/de/analyzer.json
+++ b/locales/de/analyzer.json
@@ -181,6 +181,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/en/analyzer.json b/locales/en/analyzer.json
index a1213bfb3..ae54372bb 100644
--- a/locales/en/analyzer.json
+++ b/locales/en/analyzer.json
@@ -181,6 +181,7 @@
 	"comp.groupBy.special": "Special weapon",
 	"comp.selectWeapons": "Select up to {{max}} weapons",
 	"comp.removeWeapon": "Remove weapon",
+	"comp.reorderWeapon": "Drag to reorder weapon",
 	"comp.pickWeapon": "Pick a weapon",
 	"comp.showWeaponGrid": "Show weapon selector",
 	"comp.hideWeaponGrid": "Hide weapon selector",
diff --git a/locales/es-ES/analyzer.json b/locales/es-ES/analyzer.json
index cd7ebf5ac..3ba45af64 100644
--- a/locales/es-ES/analyzer.json
+++ b/locales/es-ES/analyzer.json
@@ -183,6 +183,7 @@
 	"comp.groupBy.special": "Arma especial",
 	"comp.selectWeapons": "Selecciona hasta {{max}} armas",
 	"comp.removeWeapon": "Eliminar arma",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "Elige un arma",
 	"comp.showWeaponGrid": "Mostrar selector de armas",
 	"comp.hideWeaponGrid": "Ocultar selector de armas",
diff --git a/locales/es-US/analyzer.json b/locales/es-US/analyzer.json
index b6f5a5adb..4bbcbc86b 100644
--- a/locales/es-US/analyzer.json
+++ b/locales/es-US/analyzer.json
@@ -183,6 +183,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/fr-CA/analyzer.json b/locales/fr-CA/analyzer.json
index cf54f2f91..93305cfd1 100644
--- a/locales/fr-CA/analyzer.json
+++ b/locales/fr-CA/analyzer.json
@@ -183,6 +183,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/fr-EU/analyzer.json b/locales/fr-EU/analyzer.json
index 92ddf6b8a..8e08cb89a 100644
--- a/locales/fr-EU/analyzer.json
+++ b/locales/fr-EU/analyzer.json
@@ -183,6 +183,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/he/analyzer.json b/locales/he/analyzer.json
index 20cc93ba0..34fde8a1b 100644
--- a/locales/he/analyzer.json
+++ b/locales/he/analyzer.json
@@ -183,6 +183,7 @@
 	"comp.groupBy.special": "נשק מיוחד",
 	"comp.selectWeapons": "בחר עד ל-{{max}} נשקים",
 	"comp.removeWeapon": "הסר נשק",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "בחר נשק",
 	"comp.showWeaponGrid": "הצג בורר נשק",
 	"comp.hideWeaponGrid": "הסתר בורר נשק",
diff --git a/locales/it/analyzer.json b/locales/it/analyzer.json
index 78dc855b2..e46d1beeb 100644
--- a/locales/it/analyzer.json
+++ b/locales/it/analyzer.json
@@ -183,6 +183,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/ja/analyzer.json b/locales/ja/analyzer.json
index da81ac7ee..40ddce694 100644
--- a/locales/ja/analyzer.json
+++ b/locales/ja/analyzer.json
@@ -177,6 +177,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/ko/analyzer.json b/locales/ko/analyzer.json
index 0597d0a40..bcfa8c9c3 100644
--- a/locales/ko/analyzer.json
+++ b/locales/ko/analyzer.json
@@ -177,6 +177,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/nl/analyzer.json b/locales/nl/analyzer.json
index f35dc180e..ca37a315d 100644
--- a/locales/nl/analyzer.json
+++ b/locales/nl/analyzer.json
@@ -181,6 +181,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/pl/analyzer.json b/locales/pl/analyzer.json
index 179b4d0de..0ac2be31f 100644
--- a/locales/pl/analyzer.json
+++ b/locales/pl/analyzer.json
@@ -185,6 +185,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/pt-BR/analyzer.json b/locales/pt-BR/analyzer.json
index 98eb5ad1e..8e90599f3 100644
--- a/locales/pt-BR/analyzer.json
+++ b/locales/pt-BR/analyzer.json
@@ -183,6 +183,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/ru/analyzer.json b/locales/ru/analyzer.json
index c8333b1ba..4d10e4b7b 100644
--- a/locales/ru/analyzer.json
+++ b/locales/ru/analyzer.json
@@ -185,6 +185,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",
diff --git a/locales/zh/analyzer.json b/locales/zh/analyzer.json
index 2dc913cb7..3ca9df0a7 100644
--- a/locales/zh/analyzer.json
+++ b/locales/zh/analyzer.json
@@ -177,6 +177,7 @@
 	"comp.groupBy.special": "",
 	"comp.selectWeapons": "",
 	"comp.removeWeapon": "",
+	"comp.reorderWeapon": "",
 	"comp.pickWeapon": "",
 	"comp.showWeaponGrid": "",
 	"comp.hideWeaponGrid": "",