diff --git a/web/js/main.js b/web/js/main.js
index dd7bd65..9c8c0fd 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -336,7 +336,7 @@ function saveQuestions() {
 		objToSave.push(oneQ);
 	});
 	var jsonQues = JSON.stringify(objToSave);
-	jsonQues = btoa(jsonQues);
+	jsonQues = btoa(encodeURIComponent(jsonQues));
 	wsSend("fileOp","write###fragen.txt###"+jsonQues);
 }
 
diff --git a/web/js/websocket.js b/web/js/websocket.js
index dbe639c..e749067 100644
--- a/web/js/websocket.js
+++ b/web/js/websocket.js
@@ -115,7 +115,7 @@ var connectWs = function() {
 		} else if(key == "file") {
 			if(value == "fragen.txt") {
 				try {
-					var base64 = atob(messageParts_a[2]);
+					var base64 = decodeURIComponent(atob(messageParts_a[2]));
 					fragen = JSON.parse(base64);
 					fillFragenEditor();
 					fillFragenSelect();