diff --git a/src/js/input-controller.js b/src/js/input-controller.js
index f2c0dd41b..5b25106bb 100644
--- a/src/js/input-controller.js
+++ b/src/js/input-controller.js
@@ -625,18 +625,33 @@ function handleAlpha(event) {
     thisCharCorrect = true;
   }
 
-  if (event.key === "”" && nextCharInWord == '"') {
-    event.key = '"';
+  if (
+    (event.key === `’` || event.key === "'") &&
+    (nextCharInWord == `’` || nextCharInWord === "'")
+  ) {
+    event.key = nextCharInWord;
     thisCharCorrect = true;
   }
 
-  if (event.key === '"' && nextCharInWord == "”") {
-    event.key = "”";
+  if (
+    (event.key === `"` ||
+      event.key === "”" ||
+      event.key == "“" ||
+      event.key === "„") &&
+    (nextCharInWord == `"` ||
+      nextCharInWord === "”" ||
+      nextCharInWord === "“" ||
+      nextCharInWord === "„")
+  ) {
+    event.key = nextCharInWord;
     thisCharCorrect = true;
   }
 
-  if ((event.key === "–" || event.key === "—") && nextCharInWord == "-") {
-    event.key = "-";
+  if (
+    (event.key === "–" || event.key === "—" || event.key == "-") &&
+    (nextCharInWord == "-" || nextCharInWord === "–" || nextCharInWord === "—")
+  ) {
+    event.key = nextCharInWord;
     thisCharCorrect = true;
   }