diff --git a/client/js/keybinds.js b/client/js/keybinds.js
index f36fc67b..c2dccb10 100644
--- a/client/js/keybinds.js
+++ b/client/js/keybinds.js
@@ -2,7 +2,8 @@
 
 const $ = require("jquery");
 const Mousetrap = require("mousetrap");
-const input = $("#input");
+const wrapCursor = require("undate").wrapCursor;
+const input = $("#input").get(0);
 const sidebar = $("#sidebar");
 const windows = $("#windows");
 const contextMenuContainer = $("#context-menu-container");
@@ -78,21 +79,8 @@ for (const hotkey in colorsHotkeys) {
 	Mousetrap.bind("mod+" + hotkey, function(e) {
 		e.preventDefault();
 
-		const cursorPosStart = input.prop("selectionStart");
-		const cursorPosEnd = input.prop("selectionEnd");
-		const value = input.val();
-		let newValue = value.substring(0, cursorPosStart) + colorsHotkeys[e.key];
+		const modifier = colorsHotkeys[e.key];
 
-		if (cursorPosStart === cursorPosEnd) {
-			// If no text is selected, insert at cursor
-			newValue += value.substring(cursorPosEnd, value.length);
-		} else {
-			// If text is selected, insert formatting character at start and the end
-			newValue += value.substring(cursorPosStart, cursorPosEnd) + colorsHotkeys[e.key] + value.substring(cursorPosEnd, value.length);
-		}
-
-		input
-			.val(newValue)
-			.get(0).setSelectionRange(cursorPosStart + 1, cursorPosEnd + 1);
+		wrapCursor(input, modifier, input.selectionStart === input.selectionEnd ? "" : modifier);
 	});
 }
diff --git a/package.json b/package.json
index 53586b34..72e54098 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
     "stylelint": "9.1.1",
     "stylelint-config-standard": "18.2.0",
     "textcomplete": "0.16.1",
+    "undate": "0.2.4",
     "webpack": "3.11.0",
     "webpack-dev-server": "2.11.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 88be5724..b8cc6bad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6810,7 +6810,7 @@ ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
 
-undate@^0.2.3:
+undate@0.2.4, undate@^0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/undate/-/undate-0.2.4.tgz#ccb2a8cf38edc035d1006fcb2909c4c6024a8400"