diff --git a/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/KeyboardShortcuts.tsx b/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/KeyboardShortcuts.tsx
index 4466fcf4..66040208 100644
--- a/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/KeyboardShortcuts.tsx
+++ b/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/KeyboardShortcuts.tsx
@@ -53,12 +53,24 @@ export const KeyboardShortcuts = Extension.create<KeyboardShortcutsOptions>({
         if (this.editor.isActive("table")) {
           return this.editor.chain().focus().goToNextCell().run();
         }
+        if (this.editor.isActive("orderedList") || this.editor.isActive("bulletList")) {
+          this.editor.chain().focus().sinkListItem("listItem").run();
+          return true;
+        }
         return false;
       },
       "Shift-Tab": () => {
         if (this.editor.isActive("table")) {
           return this.editor.chain().focus().goToPreviousCell().run();
         }
+        if (this.editor.isActive("orderedList") || this.editor.isActive("bulletList")) {
+          const { $anchor } = this.editor.state.selection;
+          const isNested = $anchor.node($anchor.depth - 3)?.type.name === "listItem";
+          if (isNested) {
+            return this.editor.chain().focus().liftListItem("listItem").run();
+          }
+          return true;
+        }
         return false;
       },
       "Mod-r": () => {
diff --git a/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/SlashCommands.tsx b/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/SlashCommands.tsx
index 0d65e360..4baf4aea 100644
--- a/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/SlashCommands.tsx
+++ b/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/SlashCommands.tsx
@@ -6,6 +6,7 @@ import {
   Heading01Icon,
   Heading02Icon,
   LeftToRightListBulletIcon,
+  LeftToRightListNumberIcon,
   CheckmarkSquare04Icon,
   SourceCodeIcon,
   QuoteUpIcon,
@@ -75,6 +76,14 @@ const getSlashCommands = (t: (key: string) => string): SlashCommandItem[] => [
       editor.chain().focus().deleteRange(range).toggleBulletList().run();
     },
   },
+  {
+    title: t("editor.orderedList"),
+    description: t("editor.createOrderedList"),
+    icon: <LeftToRightListNumberIcon className="h-4 w-4" />,
+    command: ({ editor, range }) => {
+      editor.chain().focus().deleteRange(range).toggleOrderedList().run();
+    },
+  },
   {
     title: t("editor.taskList"),
     description: t("editor.createTaskList"),
diff --git a/app/_components/FeatureComponents/Notes/Parts/TipTap/SyntaxHighlightedEditor.tsx b/app/_components/FeatureComponents/Notes/Parts/TipTap/SyntaxHighlightedEditor.tsx
index 5d197004..cd894457 100644
--- a/app/_components/FeatureComponents/Notes/Parts/TipTap/SyntaxHighlightedEditor.tsx
+++ b/app/_components/FeatureComponents/Notes/Parts/TipTap/SyntaxHighlightedEditor.tsx
@@ -135,7 +135,9 @@ export const SyntaxHighlightedEditor = ({
       e.preventDefault();
       onLinkRequest?.(textarea.selectionStart !== textarea.selectionEnd);
     } else if (e.key === "Enter" && !isMod && !e.shiftKey && !e.altKey) {
-      const newContent = MarkdownUtils.handleBulletListEnter(textarea);
+      const newContent =
+        MarkdownUtils.handleBulletListEnter(textarea) ??
+        MarkdownUtils.handleOrderedListEnter(textarea);
       if (newContent !== null) {
         e.preventDefault();
         const { scrollTop, scrollLeft, selectionStart, selectionEnd } =
diff --git a/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/ListMenuDropdown.tsx b/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/ListMenuDropdown.tsx
new file mode 100644
index 00000000..49a3b5de
--- /dev/null
+++ b/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/ListMenuDropdown.tsx
@@ -0,0 +1,189 @@
+"use client";
+
+import { Editor, useEditorState } from "@tiptap/react";
+import {
+  ArrowDown01Icon,
+  LeftToRightListBulletIcon,
+  LeftToRightListNumberIcon,
+  TextIndentMoreIcon,
+  TextIndentLessIcon,
+} from "hugeicons-react";
+import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
+import { ToolbarDropdown } from "./ToolbarDropdown";
+import { useTranslations } from "next-intl";
+import * as MarkdownUtils from "@/app/_utils/markdown-editor-utils";
+
+interface ListMenuDropdownProps {
+  editor: Editor | null;
+  isMarkdownMode: boolean;
+  onMarkdownChange?: (content: string) => void;
+  listState: {
+    isInList: boolean;
+    isNested: boolean;
+    isInBulletList: boolean;
+    isInOrderedList: boolean;
+    currentItemIsEmpty: boolean;
+  };
+}
+
+export const ListMenuDropdown = ({
+  editor,
+  isMarkdownMode,
+  onMarkdownChange,
+  listState,
+}: ListMenuDropdownProps) => {
+  const t = useTranslations();
+
+  const canSink = useEditorState({
+    editor,
+    selector: ({ editor: e }) => (e ? e.can().sinkListItem("listItem") : false),
+  }) ?? false;
+
+  const canLift = useEditorState({
+    editor,
+    selector: ({ editor: e }) => (e ? e.can().liftListItem("listItem") : false),
+  }) ?? false;
+
+  if (!editor) return null;
+
+  const applyMarkdown = (fn: (ta: HTMLTextAreaElement) => string) => {
+    const textarea = document.getElementById(
+      "markdown-editor-textarea"
+    ) as HTMLTextAreaElement;
+    if (textarea && onMarkdownChange) {
+      const scrollTop = textarea.scrollTop;
+      const scrollLeft = textarea.scrollLeft;
+      const newContent = fn(textarea);
+      const selectionStart = textarea.selectionStart;
+      const selectionEnd = textarea.selectionEnd;
+      onMarkdownChange(newContent);
+      requestAnimationFrame(() => {
+        const ta = document.getElementById(
+          "markdown-editor-textarea"
+        ) as HTMLTextAreaElement;
+        if (ta) {
+          ta.focus({ preventScroll: true });
+          ta.setSelectionRange(selectionStart, selectionEnd);
+          ta.scrollTop = scrollTop;
+          ta.scrollLeft = scrollLeft;
+        }
+      });
+    }
+  };
+
+  const getCurrentListType = (): "bulletList" | "orderedList" | null => {
+    const { $from } = editor.state.selection;
+    for (let d = $from.depth; d > 0; d--) {
+      const name = $from.node(d).type.name;
+      if (name === "bulletList" || name === "orderedList") return name;
+    }
+    return null;
+  };
+
+  const liftOutOfList = () => {
+    let safety = 20;
+    while (
+      safety-- > 0 &&
+      (editor.isActive("bulletList") || editor.isActive("orderedList"))
+    ) {
+      if (!editor.chain().focus().liftListItem("listItem").run()) break;
+    }
+  };
+
+  const handleBulletList = () => {
+    if (isMarkdownMode) {
+      applyMarkdown(MarkdownUtils.insertBulletList);
+      return;
+    }
+    if (getCurrentListType() === "bulletList") {
+      liftOutOfList();
+    } else {
+      editor.chain().focus().toggleBulletList().run();
+    }
+  };
+
+  const handleOrderedList = () => {
+    if (isMarkdownMode) {
+      applyMarkdown(MarkdownUtils.insertOrderedList);
+      return;
+    }
+    if (getCurrentListType() === "orderedList") {
+      liftOutOfList();
+    } else {
+      editor.chain().focus().toggleOrderedList().run();
+    }
+  };
+
+  const handleIndent = () => {
+    if (isMarkdownMode) {
+      applyMarkdown(MarkdownUtils.indentLines);
+      return;
+    }
+    editor.chain().focus().sinkListItem("listItem").run();
+  };
+
+  const handleOutdent = () => {
+    if (isMarkdownMode) {
+      applyMarkdown(MarkdownUtils.outdentLines);
+      return;
+    }
+    editor.chain().focus().liftListItem("listItem").run();
+  };
+
+  const isActive = listState.isInList;
+
+  const trigger = (
+    <Button
+      variant={isActive ? "secondary" : "ghost"}
+      size="sm"
+      onMouseDown={(e) => e.preventDefault()}
+      className="flex items-center gap-1"
+      title={t("editor.listOptions")}
+    >
+      <LeftToRightListBulletIcon className="h-4 w-4" />
+      <ArrowDown01Icon className="h-3 w-3" />
+    </Button>
+  );
+
+  return (
+    <ToolbarDropdown trigger={trigger}>
+      <div className="py-1">
+        <button
+          className="w-full flex items-center gap-2 px-3 py-1.5 text-left hover:bg-accent text-sm"
+          onMouseDown={(e) => e.preventDefault()}
+          onClick={handleBulletList}
+        >
+          <LeftToRightListBulletIcon className="h-4 w-4 shrink-0" />
+          <span>{t("editor.toggleBulletList")}</span>
+        </button>
+        <button
+          className="w-full flex items-center gap-2 px-3 py-1.5 text-left hover:bg-accent text-sm"
+          onMouseDown={(e) => e.preventDefault()}
+          onClick={handleOrderedList}
+        >
+          <LeftToRightListNumberIcon className="h-4 w-4 shrink-0" />
+          <span>{t("editor.toggleOrderedList")}</span>
+        </button>
+        <div className="my-1 border-t border-border" />
+        <button
+          className="w-full flex items-center gap-2 px-3 py-1.5 text-left hover:bg-accent text-sm disabled:opacity-50 disabled:cursor-not-allowed"
+          onMouseDown={(e) => e.preventDefault()}
+          onClick={handleIndent}
+          disabled={!isMarkdownMode && !canSink}
+        >
+          <TextIndentMoreIcon className="h-4 w-4 shrink-0" />
+          <span>{t("editor.indentListItem")}</span>
+        </button>
+        <button
+          className="w-full flex items-center gap-2 px-3 py-1.5 text-left hover:bg-accent text-sm disabled:opacity-50 disabled:cursor-not-allowed"
+          onMouseDown={(e) => e.preventDefault()}
+          onClick={handleOutdent}
+          disabled={!isMarkdownMode && !canLift}
+        >
+          <TextIndentLessIcon className="h-4 w-4 shrink-0" />
+          <span>{t("editor.outdentListItem")}</span>
+        </button>
+      </div>
+    </ToolbarDropdown>
+  );
+};
diff --git a/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/TipTapToolbar.tsx b/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/TipTapToolbar.tsx
index de647511..4cc654a2 100644
--- a/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/TipTapToolbar.tsx
+++ b/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/TipTapToolbar.tsx
@@ -1,4 +1,4 @@
-import { Editor } from "@tiptap/react";
+import { Editor, useEditorState } from "@tiptap/react";
 import {
   TextBoldIcon,
   TextItalicIcon,
@@ -13,13 +13,13 @@ import {
   Tv02Icon,
   TextUnderlineIcon,
   Image02Icon,
-  LeftToRightListBulletIcon,
 } from "hugeicons-react";
 import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
 import { FileModal } from "@/app/_components/GlobalComponents/Modals/FilesModal/FileModal";
 import { ImageSizeModal } from "@/app/_components/GlobalComponents/Modals/ImageSizeModal";
 import { CodeBlockDropdown } from "@/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/CodeBlocksDropdown";
 import { DiagramsDropdown } from "@/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/DiagramsDropdown";
+import { ListMenuDropdown } from "@/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/ListMenuDropdown";
 import { TableInsertModal } from "@/app/_components/FeatureComponents/Notes/Parts/Table/TableInsertModal";
 import { FontFamilyDropdown } from "@/app/_components/FeatureComponents/Notes/Parts/TipTap/Toolbar/FontFamilyDropdown";
 import { useState, useEffect } from "react";
@@ -100,6 +100,29 @@ export const TiptapToolbar = ({
     }
   }, [linkRequestPending, linkRequestHasSelection, isMarkdownMode, editor, onLinkRequestHandled]);
 
+  const listState = useEditorState({
+    editor,
+    selector: ({ editor: e }) => {
+      if (!e) return { isInList: false, isNested: false, isInBulletList: false, isInOrderedList: false, currentItemIsEmpty: false };
+      const isInBulletList = e.isActive('bulletList');
+      const isInOrderedList = e.isActive('orderedList');
+      const isInList = isInBulletList || isInOrderedList;
+      let isNested = false;
+      if (isInList) {
+        const { $anchor } = e.state.selection;
+        outer: for (let d = $anchor.depth; d >= 0; d--) {
+          if ($anchor.node(d).type.name === 'listItem') {
+            for (let d2 = d - 1; d2 >= 0; d2--) {
+              if ($anchor.node(d2).type.name === 'listItem') { isNested = true; break outer; }
+            }
+            break;
+          }
+        }
+      }
+      return { isInList, isNested, isInBulletList, isInOrderedList, currentItemIsEmpty: e.state.selection.$anchor.parent.textContent === '' };
+    },
+  }) ?? { isInList: false, isNested: false, isInBulletList: false, isInOrderedList: false, currentItemIsEmpty: false };
+
   if (!editor) {
     return null;
   }
@@ -459,20 +482,12 @@ export const TiptapToolbar = ({
           >
             <Heading02Icon className="h-4 w-4" />
           </Button>
-          <Button
-            variant={editor && editor.isActive("bulletList") ? "secondary" : "ghost"}
-            size="sm"
-            onMouseDown={(e) => e.preventDefault()}
-            onClick={() =>
-              handleDualModeButton(
-                () => editor.chain().focus().toggleBulletList().run(),
-                MarkdownUtils.insertBulletList
-              )
-            }
-            title={`${t('editor.toggleBulletList')} (${mod}+Shift+8)`}
-          >
-            <LeftToRightListBulletIcon className="h-4 w-4" />
-          </Button>
+          <ListMenuDropdown
+            editor={editor}
+            isMarkdownMode={isMarkdownMode}
+            onMarkdownChange={onMarkdownChange}
+            listState={listState}
+          />
           <Button
             variant={editor && editor.isActive("blockquote") ? "secondary" : "ghost"}
             size="sm"
diff --git a/app/_translations/de.json b/app/_translations/de.json
index 024e2bf6..b3289636 100644
--- a/app/_translations/de.json
+++ b/app/_translations/de.json
@@ -1140,7 +1140,11 @@
     "toggleStrikethrough": "Durchstreichung umschalten",
     "toggleInlineCode": "Code-Formatierung umschalten",
     "toggleHeading2": "Überschrift umschalten",
+    "listOptions": "Liste",
     "toggleBulletList": "Aufzählungsliste umschalten",
+    "toggleOrderedList": "Nummerierte Liste umschalten",
+    "indentListItem": "Listenelement einrücken",
+    "outdentListItem": "Listenelement ausrücken",
     "toggleBlockquote": "Zitat umschalten",
     "toggleLink": "Verknüpfung einfügen",
     "editImageSize": "Bilgröße ändern",
@@ -1174,6 +1178,7 @@
     "heading2": "Überschrift 2",
     "mediumSectionHeading": "Mittlere Abschnittsüberschrift",
     "createBulletedList": "Aufzählungsliste erstellen",
+    "createOrderedList": "Nummerierte Liste erstellen",
     "taskList": "Aufgabenliste erstellen",
     "createTaskList": "Aufgabenliste erstellen",
     "createCodeBlock": "Code-Block erstellen",
diff --git a/app/_translations/en.json b/app/_translations/en.json
index e4c8ade6..9f0e55f6 100644
--- a/app/_translations/en.json
+++ b/app/_translations/en.json
@@ -1169,7 +1169,11 @@
     "toggleStrikethrough": "Toggle strikethrough",
     "toggleInlineCode": "Toggle inline code",
     "toggleHeading2": "Toggle heading 2",
+    "listOptions": "List",
     "toggleBulletList": "Toggle bullet list",
+    "toggleOrderedList": "Toggle ordered list",
+    "indentListItem": "Indent list item",
+    "outdentListItem": "Outdent list item",
     "toggleBlockquote": "Toggle blockquote",
     "toggleLink": "Toggle link",
     "editImageSize": "Edit image size",
@@ -1203,6 +1207,7 @@
     "heading2": "Heading 2",
     "mediumSectionHeading": "Medium section heading",
     "createBulletedList": "Create a bulleted list",
+    "createOrderedList": "Create a numbered list",
     "taskList": "Task List",
     "createTaskList": "Create a task list",
     "createCodeBlock": "Create a code block",
diff --git a/app/_translations/es.json b/app/_translations/es.json
index a89a0196..0bb4ff81 100644
--- a/app/_translations/es.json
+++ b/app/_translations/es.json
@@ -1144,7 +1144,11 @@
     "toggleStrikethrough": "Alternar tachado",
     "toggleInlineCode": "Alternar código en línea",
     "toggleHeading2": "Alternar encabezado 2",
+    "listOptions": "Lista",
     "toggleBulletList": "Alternar lista con viñetas",
+    "toggleOrderedList": "Alternar lista numerada",
+    "indentListItem": "Sangrar elemento de lista",
+    "outdentListItem": "Quitar sangría del elemento",
     "toggleBlockquote": "Alternar cita",
     "toggleLink": "Alternar enlace",
     "editImageSize": "Editar tamaño de imagen",
@@ -1178,6 +1182,7 @@
     "heading2": "Encabezado 2",
     "mediumSectionHeading": "Encabezado de sección mediana",
     "createBulletedList": "Crear una lista con viñetas",
+    "createOrderedList": "Crear una lista numerada",
     "taskList": "Lista de tareas",
     "createTaskList": "Crear una lista de tareas",
     "createCodeBlock": "Crear un bloque de código",
diff --git a/app/_translations/fr.json b/app/_translations/fr.json
index fd6f0e97..f9b9ee08 100644
--- a/app/_translations/fr.json
+++ b/app/_translations/fr.json
@@ -1144,7 +1144,11 @@
     "toggleStrikethrough": "Basculer le barré",
     "toggleInlineCode": "Basculer le code en ligne",
     "toggleHeading2": "Basculer titre 2",
+    "listOptions": "Liste",
     "toggleBulletList": "Basculer liste à puces",
+    "toggleOrderedList": "Basculer liste numérotée",
+    "indentListItem": "Indenter l'élément de liste",
+    "outdentListItem": "Désindenter l'élément de liste",
     "toggleBlockquote": "Basculer bloc de citation",
     "toggleLink": "Basculer le lien",
     "editImageSize": "Modifier la taille de l’image",
@@ -1178,6 +1182,7 @@
     "heading2": "Titre 2",
     "mediumSectionHeading": "Titre de section moyen",
     "createBulletedList": "Créer une liste à puces",
+    "createOrderedList": "Créer une liste numérotée",
     "taskList": "Liste",
     "createTaskList": "Créer une Liste",
     "createCodeBlock": "Créer un bloc de code",
diff --git a/app/_translations/it.json b/app/_translations/it.json
index 464420d0..f7b31d05 100644
--- a/app/_translations/it.json
+++ b/app/_translations/it.json
@@ -1144,7 +1144,11 @@
     "toggleStrikethrough": "Barrato",
     "toggleInlineCode": "Codice in linea",
     "toggleHeading2": "Intestazione 2",
+    "listOptions": "Lista",
     "toggleBulletList": "Elenco puntato",
+    "toggleOrderedList": "Elenco numerato",
+    "indentListItem": "Indenta elemento lista",
+    "outdentListItem": "Riduci rientro elemento lista",
     "toggleBlockquote": "Citazione",
     "toggleLink": "Link",
     "editImageSize": "Modifica dimensioni immagine",
@@ -1178,6 +1182,7 @@
     "heading2": "Intestazione 2",
     "mediumSectionHeading": "Intestazione sezione media",
     "createBulletedList": "Crea elenco puntato",
+    "createOrderedList": "Crea elenco numerato",
     "taskList": "Lista Attività",
     "createTaskList": "Crea lista attività",
     "createCodeBlock": "Crea blocco di codice",
diff --git a/app/_translations/klingon.json b/app/_translations/klingon.json
index 6d8cb02f..24c2beab 100644
--- a/app/_translations/klingon.json
+++ b/app/_translations/klingon.json
@@ -1169,7 +1169,11 @@
     "toggleStrikethrough": "Qaw' tlhegh yIchoH",
     "toggleInlineCode": "mI' wI' yIchoH",
     "toggleHeading2": "mung 2 yIchoH",
+    "listOptions": "tetlh",
     "toggleBulletList": "mI'be' tetlh yIchoH",
+    "toggleOrderedList": "mI' tetlh yIchoH",
+    "indentListItem": "tetlh gho' yIchoH",
+    "outdentListItem": "tetlh gho' yIchev",
     "toggleBlockquote": "le' tetlh yIchoH",
     "toggleLink": "lI' yIchoH",
     "editImageSize": "nagh beQ 'ab yIchoH",
@@ -1203,6 +1207,7 @@
     "heading2": "mung 2",
     "mediumSectionHeading": "mung motlh",
     "createBulletedList": "mI'be' tetlh yIchenmoH",
+    "createOrderedList": "mI' tetlh yIchenmoH",
     "taskList": "Qu' tetlh",
     "createTaskList": "Qu' tetlh yIchenmoH",
     "createCodeBlock": "mI' wI' yIchenmoH",
diff --git a/app/_translations/ko.json b/app/_translations/ko.json
index 7428daf3..20d39267 100644
--- a/app/_translations/ko.json
+++ b/app/_translations/ko.json
@@ -1169,7 +1169,11 @@
     "toggleStrikethrough": "취소선 전환",
     "toggleInlineCode": "인라인 코드 전환",
     "toggleHeading2": "제목 2 전환",
+    "listOptions": "목록",
     "toggleBulletList": "글머리 기호 목록 전환",
+    "toggleOrderedList": "번호 매기기 목록 전환",
+    "indentListItem": "목록 항목 들여쓰기",
+    "outdentListItem": "목록 항목 내어쓰기",
     "toggleBlockquote": "인용문 전환",
     "toggleLink": "링크 전환",
     "editImageSize": "이미지 크기 편집",
@@ -1203,6 +1207,7 @@
     "heading2": "제목 2",
     "mediumSectionHeading": "중간 섹션 제목",
     "createBulletedList": "글머리 기호 목록 만들기",
+    "createOrderedList": "번호 매기기 목록 만들기",
     "taskList": "작업 목록",
     "createTaskList": "작업 목록 만들기",
     "createCodeBlock": "코드 블록 만들기",
diff --git a/app/_translations/nl.json b/app/_translations/nl.json
index 6f03159b..c5925aff 100644
--- a/app/_translations/nl.json
+++ b/app/_translations/nl.json
@@ -1144,7 +1144,11 @@
     "toggleStrikethrough": "Doorhalen wisselen",
     "toggleInlineCode": "Inline code wisselen",
     "toggleHeading2": "Kop 2 wisselen",
+    "listOptions": "Lijst",
     "toggleBulletList": "Opsommingslijst wisselen",
+    "toggleOrderedList": "Genummerde lijst wisselen",
+    "indentListItem": "Lijstitem inspringen",
+    "outdentListItem": "Inspringing lijstitem verwijderen",
     "toggleBlockquote": "Citaat wisselen",
     "toggleLink": "Link wisselen",
     "editImageSize": "Afbeeldingsgrootte bewerken",
@@ -1178,6 +1182,7 @@
     "heading2": "Kop 2",
     "mediumSectionHeading": "Middelgrote sectiekop",
     "createBulletedList": "Maak een opsommingslijst",
+    "createOrderedList": "Maak een genummerde lijst",
     "taskList": "Takenlijst",
     "createTaskList": "Maak een takenlijst",
     "createCodeBlock": "Maak een codeblok",
diff --git a/app/_translations/pirate.json b/app/_translations/pirate.json
index fb6836bc..5af5dec5 100644
--- a/app/_translations/pirate.json
+++ b/app/_translations/pirate.json
@@ -1169,7 +1169,11 @@
     "toggleStrikethrough": "Strike",
     "toggleInlineCode": "Cipher",
     "toggleHeading2": "Sub-headline",
+    "listOptions": "Loot Menu",
     "toggleBulletList": "Shot List",
+    "toggleOrderedList": "Numbered Shot List",
+    "indentListItem": "Walk the Plank Further",
+    "outdentListItem": "Walk the Plank Back",
     "toggleBlockquote": "Parrot",
     "toggleLink": "Rope",
     "editImageSize": "Resize",
@@ -1203,6 +1207,7 @@
     "heading2": "Headline 2",
     "mediumSectionHeading": "Mid Headline",
     "createBulletedList": "Make shot list",
+    "createOrderedList": "Make numbered shot list",
     "taskList": "Duty List",
     "createTaskList": "Make duty list",
     "createCodeBlock": "Make cipher block",
diff --git a/app/_translations/pl.json b/app/_translations/pl.json
index 9ed9e4c5..678c110f 100644
--- a/app/_translations/pl.json
+++ b/app/_translations/pl.json
@@ -1144,7 +1144,11 @@
     "toggleStrikethrough": "Włącz/wyłącz przekreślenie",
     "toggleInlineCode": "Włącz/wyłącz kod w linii",
     "toggleHeading2": "Włącz/wyłącz nagłówek 2",
+    "listOptions": "Lista",
     "toggleBulletList": "Włącz/wyłącz listę punktowaną",
+    "toggleOrderedList": "Włącz/wyłącz listę numerowaną",
+    "indentListItem": "Wcięcie elementu listy",
+    "outdentListItem": "Usuń wcięcie elementu listy",
     "toggleBlockquote": "Włącz/wyłącz blok cytatu",
     "toggleLink": "Włącz/wyłącz link",
     "editImageSize": "Edytuj rozmiar obrazu",
@@ -1178,6 +1182,7 @@
     "heading2": "Nagłówek 2",
     "mediumSectionHeading": "Średni nagłówek sekcji",
     "createBulletedList": "Utwórz listę punktowaną",
+    "createOrderedList": "Utwórz listę numerowaną",
     "taskList": "Lista zadań",
     "createTaskList": "Utwórz listę zadań",
     "createCodeBlock": "Utwórz blok kodu",
diff --git a/app/_translations/ru.json b/app/_translations/ru.json
index 3f65a211..1d6228c0 100644
--- a/app/_translations/ru.json
+++ b/app/_translations/ru.json
@@ -1169,7 +1169,11 @@
     "toggleStrikethrough": "Переключить зачёркивание",
     "toggleInlineCode": "Переключить inline-код",
     "toggleHeading2": "Переключить заголовок 2",
+    "listOptions": "Список",
     "toggleBulletList": "Переключить маркированный список",
+    "toggleOrderedList": "Переключить нумерованный список",
+    "indentListItem": "Увеличить отступ элемента списка",
+    "outdentListItem": "Уменьшить отступ элемента списка",
     "toggleBlockquote": "Переключить цитату",
     "toggleLink": "Переключить ссылку",
     "editImageSize": "Редактировать размер изображения",
@@ -1203,6 +1207,7 @@
     "heading2": "Заголовок 2",
     "mediumSectionHeading": "Средний заголовок раздела",
     "createBulletedList": "Создать маркированный список",
+    "createOrderedList": "Создать нумерованный список",
     "taskList": "Список задач",
     "createTaskList": "Создать список задач",
     "createCodeBlock": "Создать блок кода",
diff --git a/app/_translations/tr.json b/app/_translations/tr.json
index d85a53ad..b52edf70 100644
--- a/app/_translations/tr.json
+++ b/app/_translations/tr.json
@@ -1171,7 +1171,11 @@
     "toggleStrikethrough": "Üstü çizili yap/kaldır",
     "toggleInlineCode": "Satır içi kodu aç/kapat",
     "toggleHeading2": "Başlık 2'yi aç/kapat",
+    "listOptions": "Liste",
     "toggleBulletList": "Maddeli listeyi aç/kapat",
+    "toggleOrderedList": "Numaralı listeyi aç/kapat",
+    "indentListItem": "Liste öğesini girintile",
+    "outdentListItem": "Liste öğesinin girintisini azalt",
     "toggleBlockquote": "Alıntıyı aç/kapat",
     "toggleLink": "Bağlantıyı aç/kapat",
     "editImageSize": "Görsel boyutunu düzenle",
@@ -1205,6 +1209,7 @@
     "heading2": "Başlık 2",
     "mediumSectionHeading": "Orta bölüm başlığı",
     "createBulletedList": "Maddeli liste oluştur",
+    "createOrderedList": "Numaralı liste oluştur",
     "taskList": "Görev Listesi",
     "createTaskList": "Görev listesi oluştur",
     "createCodeBlock": "Kod bloğu oluştur",
diff --git a/app/_translations/zh.json b/app/_translations/zh.json
index a4f3209b..c6155c1a 100644
--- a/app/_translations/zh.json
+++ b/app/_translations/zh.json
@@ -1169,7 +1169,11 @@
     "toggleStrikethrough": "切换删除线",
     "toggleInlineCode": "切换行内代码",
     "toggleHeading2": "切换标题 2",
+    "listOptions": "列表",
     "toggleBulletList": "切换无序列表",
+    "toggleOrderedList": "切换有序列表",
+    "indentListItem": "增加列表项缩进",
+    "outdentListItem": "减少列表项缩进",
     "toggleBlockquote": "切换引用块",
     "toggleLink": "切换链接",
     "editImageSize": "编辑图片大小",
@@ -1203,6 +1207,7 @@
     "heading2": "标题 2",
     "mediumSectionHeading": "中节标题",
     "createBulletedList": "创建无序列表",
+    "createOrderedList": "创建有序列表",
     "taskList": "任务列表",
     "createTaskList": "创建任务列表",
     "createCodeBlock": "创建代码块",
diff --git a/app/_utils/markdown-editor-utils.ts b/app/_utils/markdown-editor-utils.ts
index 6b23a833..2e0369b8 100644
--- a/app/_utils/markdown-editor-utils.ts
+++ b/app/_utils/markdown-editor-utils.ts
@@ -170,7 +170,8 @@ const processLineSelection = (
   const { lineEnd } = _getLineAtPosition(value, end);
   const lines = value.substring(lineStart, lineEnd).split("\n");
 
-  const allMatch = lines.every((l) => pattern.test(l) || l.trim() === "");
+  const hasNonEmpty = lines.some((l) => l.trim() !== "");
+  const allMatch = hasNonEmpty && lines.every((l) => pattern.test(l) || l.trim() === "");
   const newLines = lines.map((line, i) => processFn(line, i, allMatch));
   const newContent = newLines.join("\n");
   const newValue =
@@ -187,20 +188,93 @@ const processLineSelection = (
   return newValue;
 };
 
-export const insertBulletList = (textarea: HTMLTextAreaElement): string =>
-  processLineSelection(textarea, /^-\s/, (line, _, allMatch) => {
-    if (line.trim() === "") return line;
-    return allMatch ? line.replace(/^-\s/, "") : `- ${line}`;
+export const insertBulletList = (textarea: HTMLTextAreaElement): string => {
+  const { start, end } = getTextareaSelection(textarea);
+  const value = textarea.value;
+  const { lineStart } = _getLineAtPosition(value, start);
+  const { lineEnd } = _getLineAtPosition(value, end);
+  const lines = value.substring(lineStart, lineEnd).split("\n");
+
+  const nonEmpty = lines.filter((l) => l.trim() !== "");
+  const allBullet =
+    nonEmpty.length > 0 && nonEmpty.every((l) => /^\s*-\s/.test(l));
+  const allOrdered =
+    nonEmpty.length > 0 && nonEmpty.every((l) => /^\s*\d+\.\s/.test(l));
+  const toggle = allBullet || allOrdered;
+
+  const newLines = lines.map((line) => {
+    if (allBullet) {
+      return line.trim() === "" ? line : line.replace(/^(\s*)-\s+/, "$1");
+    }
+    if (allOrdered) {
+      return line.trim() === "" ? line : line.replace(/^(\s*)\d+\.\s+/, "$1-   ");
+    }
+    if (line.trim() === "") return "-   ";
+    if (/^\s*-\s/.test(line)) return line;
+    if (/^\s*\d+\.\s/.test(line))
+      return line.replace(/^(\s*)\d+\.\s+/, "$1-   ");
+    return "-   " + line;
   });
 
+  const newContent = newLines.join("\n");
+  const newValue =
+    value.substring(0, lineStart) + newContent + value.substring(lineEnd);
+  const cursorTarget = lineStart + newLines[0].length;
+  if (toggle) {
+    _updateEditor(textarea, newValue, lineStart, lineStart + newContent.length);
+  } else {
+    _updateEditor(textarea, newValue, cursorTarget, cursorTarget);
+  }
+  return newValue;
+};
+
 export const insertOrderedList = (textarea: HTMLTextAreaElement): string => {
+  const { start, end } = getTextareaSelection(textarea);
+  const value = textarea.value;
+  const { lineStart } = _getLineAtPosition(value, start);
+  const { lineEnd } = _getLineAtPosition(value, end);
+  const lines = value.substring(lineStart, lineEnd).split("\n");
+
+  const nonEmpty = lines.filter((l) => l.trim() !== "");
+  const allOrdered =
+    nonEmpty.length > 0 && nonEmpty.every((l) => /^\s*\d+\.\s/.test(l));
+  const allBullet =
+    nonEmpty.length > 0 && nonEmpty.every((l) => /^\s*-\s/.test(l));
+  const toggle = allOrdered || allBullet;
+
   let num = 1;
-  return processLineSelection(textarea, /^\d+\.\s/, (line, _, allMatch) => {
-    if (line.trim() === "") return line;
-    if (allMatch) return line.replace(/^\d+\.\s/, "");
-    const clean = line.replace(/^\d+\.\s/, "");
-    return `${num++}. ${clean}`;
+  const newLines = lines.map((line) => {
+    if (allOrdered) {
+      return line.trim() === "" ? line : line.replace(/^(\s*)\d+\.\s+/, "$1");
+    }
+    if (allBullet) {
+      if (line.trim() === "") return line;
+      return line.replace(/^(\s*)-\s+/, `$1${num++}.  `);
+    }
+    if (line.trim() === "") return `${num++}.  `;
+    if (/^\s*\d+\.\s/.test(line)) {
+      const indent = line.match(/^(\s*)/)?.[1] ?? "";
+      const clean = line.replace(/^\s*\d+\.\s+/, "");
+      return `${indent}${num++}.  ${clean}`;
+    }
+    if (/^\s*-\s/.test(line)) {
+      const indent = line.match(/^(\s*)/)?.[1] ?? "";
+      const clean = line.replace(/^\s*-\s+/, "");
+      return `${indent}${num++}.  ${clean}`;
+    }
+    return `${num++}.  ${line}`;
   });
+
+  const newContent = newLines.join("\n");
+  const newValue =
+    value.substring(0, lineStart) + newContent + value.substring(lineEnd);
+  const cursorTarget = lineStart + newLines[0].length;
+  if (toggle) {
+    _updateEditor(textarea, newValue, lineStart, lineStart + newContent.length);
+  } else {
+    _updateEditor(textarea, newValue, cursorTarget, cursorTarget);
+  }
+  return newValue;
 };
 
 export const insertTaskList = (textarea: HTMLTextAreaElement): string =>
@@ -342,10 +416,62 @@ export const handleBulletListEnter = (
   const { start } = getTextareaSelection(textarea);
   const { lineContent, lineStart } = _getLineAtPosition(textarea.value, start);
 
-  const match = lineContent.match(/^(-\s+)(.*)/);
+  const match = lineContent.match(/^(\s*)(-\s+)(.*)/);
+  if (!match) return null;
+
+  const [, indent, bullet, content] = match;
+  if (!content.trim()) {
+    const newVal =
+      textarea.value.substring(0, lineStart) +
+      textarea.value.substring(lineStart + lineContent.length);
+    return _updateEditor(textarea, newVal, lineStart, lineStart);
+  }
+
+  return insertTextAtCursor(textarea, "\n" + indent + bullet, "", "", 0);
+};
+
+export const indentLines = (textarea: HTMLTextAreaElement): string => {
+  let orderedCounter = 1;
+  let lastWasOrdered = false;
+  const result = processLineSelection(textarea, /^/, (line) => {
+    if (line.trim() === "") {
+      lastWasOrdered = false;
+      return line;
+    }
+    const orderedMatch = line.match(/^(\s*)(\d+)\.\s+(.*)/);
+    if (orderedMatch) {
+      if (!lastWasOrdered) orderedCounter = 1;
+      const [, indent, , content] = orderedMatch;
+      lastWasOrdered = true;
+      return `    ${indent}${orderedCounter++}.  ${content}`;
+    }
+    lastWasOrdered = false;
+    return "    " + line;
+  });
+  const pos = textarea.selectionEnd;
+  textarea.setSelectionRange(pos, pos);
+  return result;
+};
+
+export const outdentLines = (textarea: HTMLTextAreaElement): string => {
+  const result = processLineSelection(textarea, /^ {4}/, (line) =>
+    line.startsWith("    ") ? line.slice(4) : line
+  );
+  const pos = textarea.selectionEnd;
+  textarea.setSelectionRange(pos, pos);
+  return result;
+};
+
+export const handleOrderedListEnter = (
+  textarea: HTMLTextAreaElement
+): string | null => {
+  const { start } = getTextareaSelection(textarea);
+  const { lineContent, lineStart } = _getLineAtPosition(textarea.value, start);
+
+  const match = lineContent.match(/^(\s*)(\d+)\.(\s+)(.*)/);
   if (!match) return null;
 
-  const [, bullet, content] = match;
+  const [, indent, numStr, spacing, content] = match;
   if (!content.trim()) {
     const newVal =
       textarea.value.substring(0, lineStart) +
@@ -353,7 +479,8 @@ export const handleBulletListEnter = (
     return _updateEditor(textarea, newVal, lineStart, lineStart);
   }
 
-  return insertTextAtCursor(textarea, "\n" + bullet, "", "", 0);
+  const nextNum = parseInt(numStr, 10) + 1;
+  return insertTextAtCursor(textarea, `\n${indent}${nextNum}.${spacing}`, "", "", 0);
 };
 
 export const autolinkPastedContent = (
diff --git a/app/_utils/markdown-utils.tsx b/app/_utils/markdown-utils.tsx
index badc9bc2..12eb2c48 100644
--- a/app/_utils/markdown-utils.tsx
+++ b/app/_utils/markdown-utils.tsx
@@ -94,10 +94,7 @@ export const createTurndownService = (tableSyntax?: TableSyntax) => {
       const isElement = (n: ParentNode): n is HTMLElement => n.nodeType === 1;
 
       if (parent.nodeName === "LI") {
-        const elementChildren = Array.from(parent.children).filter(
-          (child) => child.nodeType === 1
-        );
-        return elementChildren.length === 1;
+        return true;
       }
       if (
         parent.nodeName === "DIV" &&