diff --git a/Cargo.lock b/Cargo.lock
index fc13b42..3fdd281 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,26 +53,6 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
-[[package]]
-name = "arboard"
-version = "3.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
-dependencies = [
- "clipboard-win",
- "image",
- "log",
- "objc2",
- "objc2-app-kit",
- "objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-foundation",
- "parking_lot",
- "percent-encoding",
- "windows-sys 0.59.0",
- "x11rb",
-]
-
 [[package]]
 name = "arg_enum_proc_macro"
 version = "0.3.4"
@@ -670,7 +650,6 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 name = "ekphos"
 version = "0.20.5"
 dependencies = [
- "arboard",
  "bincode",
  "clipboard-rs",
  "crossterm",
diff --git a/Cargo.toml b/Cargo.toml
index 91b31d5..20571a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,6 @@ dirs = "5.0"
 shellexpand = "3.1"
 ureq = "2.9"
 syntect = { version = "5.2", default-features = false, features = ["default-fancy"] }
-arboard = "3.4"
 unicode-width = "0.2"
 htmd = "0.5"
 clipboard-rs = "0.3"
diff --git a/flake.nix b/flake.nix
index 5dce7f0..df4f5f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
           ];
 
           buildInputs = with pkgs; [
-            # Clipboard support (arboard/clipboard-rs)
+            # Clipboard support (clipboard-rs)
           ] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
             xorg.libxcb
             xorg.libX11
diff --git a/src/editor/mod.rs b/src/editor/mod.rs
index f31e99a..c593e1c 100644
--- a/src/editor/mod.rs
+++ b/src/editor/mod.rs
@@ -27,6 +27,8 @@ use std::cell::RefCell;
 use std::collections::{BTreeMap, HashSet};
 use unicode_width::UnicodeWidthChar;
 
+use clipboard_rs::{Clipboard as ClipboardTrait, ClipboardContext};
+
 #[inline]
 fn char_display_width(ch: char, tab_width: u16) -> u16 {
     if ch == '\t' {
@@ -586,8 +588,8 @@ impl Editor {
         if let Some(text) = self.visual_line_selected_text() {
             self.clipboard = Some(text.clone());
             self.clipboard_linewise = true;
-            if let Ok(mut clipboard) = arboard::Clipboard::new() {
-                let _ = clipboard.set_text(&text);
+            if let Ok(ctx) = ClipboardContext::new() {
+                let _ = ctx.set_text(text.clone());
             }
         }
     }
@@ -612,8 +614,8 @@ impl Editor {
             let clipboard_text = deleted_lines.join("\n") + "\n";
             self.clipboard = Some(clipboard_text.clone());
             self.clipboard_linewise = true;
-            if let Ok(mut clipboard) = arboard::Clipboard::new() {
-                let _ = clipboard.set_text(&clipboard_text);
+            if let Ok(ctx) = ClipboardContext::new() {
+                let _ = ctx.set_text(clipboard_text.clone());
             }
 
             let cursor_before = self.cursor.pos();
@@ -678,8 +680,8 @@ impl Editor {
         if let Some(text) = self.visual_block_selected_text() {
             self.clipboard = Some(text.clone());
             self.clipboard_linewise = false;
-            if let Ok(mut clipboard) = arboard::Clipboard::new() {
-                let _ = clipboard.set_text(&text);
+            if let Ok(ctx) = ClipboardContext::new() {
+                let _ = ctx.set_text(text.clone());
             }
         }
     }
@@ -718,8 +720,8 @@ impl Editor {
             let clipboard_text = deleted_lines.join("\n");
             self.clipboard = Some(clipboard_text.clone());
             self.clipboard_linewise = false;
-            if let Ok(mut clipboard) = arboard::Clipboard::new() {
-                let _ = clipboard.set_text(&clipboard_text);
+            if let Ok(ctx) = ClipboardContext::new() {
+                let _ = ctx.set_text(clipboard_text.clone());
             }
 
             let cursor_before = self.cursor.pos();
@@ -1969,8 +1971,8 @@ impl Editor {
         if let Some(text) = self.selected_text() {
             self.clipboard = Some(text.clone());
             self.clipboard_linewise = false;
-            if let Ok(mut clipboard) = arboard::Clipboard::new() {
-                let _ = clipboard.set_text(&text);
+            if let Ok(ctx) = ClipboardContext::new() {
+                let _ = ctx.set_text(text.clone());
             }
         }
     }
@@ -1981,8 +1983,8 @@ impl Editor {
             let deleted = self.buffer.delete_text_range(start.row, start.col, end.row, end.col);
             self.clipboard = Some(deleted.clone());
             self.clipboard_linewise = false;
-            if let Ok(mut clipboard) = arboard::Clipboard::new() {
-                let _ = clipboard.set_text(&deleted);
+            if let Ok(ctx) = ClipboardContext::new() {
+                let _ = ctx.set_text(deleted.clone());
             }
             self.wrap_cache.invalidate_from(start.row);
 
@@ -2010,8 +2012,8 @@ impl Editor {
 
         // Copy to clipboard
         self.clipboard = Some(deleted_text.clone());
-        if let Ok(mut clipboard) = arboard::Clipboard::new() {
-            let _ = clipboard.set_text(&deleted_text);
+        if let Ok(ctx) = ClipboardContext::new() {
+            let _ = ctx.set_text(deleted_text.clone());
         }
 
         // Delete the line
@@ -2042,7 +2044,7 @@ impl Editor {
 
     pub fn paste(&mut self) {
         let text = self.clipboard.clone().or_else(|| {
-            arboard::Clipboard::new().ok()?.get_text().ok()
+            ClipboardContext::new().ok()?.get_text().ok()
         });
         if let Some(text) = text {
             self.insert_str(&text);
@@ -2056,8 +2058,8 @@ impl Editor {
         // Try internal clipboard first, then fall back to system clipboard
         let (text, linewise) = if let Some(text) = self.clipboard.clone() {
             (text, self.clipboard_linewise)
-        } else if let Ok(mut clipboard) = arboard::Clipboard::new() {
-            if let Ok(text) = clipboard.get_text() {
+        } else if let Ok(ctx) = ClipboardContext::new() {
+            if let Ok(text) = ctx.get_text() {
                 // For system clipboard, detect linewise by checking if ends with newline
                 let linewise = text.ends_with('\n');
                 (text, linewise)
@@ -2108,8 +2110,8 @@ impl Editor {
     pub fn paste_before(&mut self) {
         let (text, linewise) = if let Some(text) = self.clipboard.clone() {
             (text, self.clipboard_linewise)
-        } else if let Ok(mut clipboard) = arboard::Clipboard::new() {
-            if let Ok(text) = clipboard.get_text() {
+        } else if let Ok(ctx) = ClipboardContext::new() {
+            if let Ok(text) = ctx.get_text() {
                 // For system clipboard, detect linewise by checking if ends with newline
                 let linewise = text.ends_with('\n');
                 (text, linewise)