diff --git a/src/css/simplemde.css b/src/css/simplemde.css
index 5e03395..7056c68 100644
--- a/src/css/simplemde.css
+++ b/src/css/simplemde.css
@@ -59,7 +59,10 @@
 
 .editor-toolbar.fullscreen {
 	width: 100%;
-	min-height: 50px;
+	height: 50px;
+	overflow-x: auto;
+	overflow-y: hidden;
+	white-space: nowrap;
 	background: #fff;
 	border: 0;
 	position: fixed;
diff --git a/src/js/codemirror/fullscreen.js b/src/js/codemirror/fullscreen.js
index 4ac3a1c..f2f8c7a 100644
--- a/src/js/codemirror/fullscreen.js
+++ b/src/js/codemirror/fullscreen.js
@@ -1,6 +1,5 @@
-// NOTE: This has been modified from the original version to add fullscreen class to the status bar too
-
-
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -27,7 +26,6 @@
 	wrap.style.height = "auto";
 	wrap.className += " CodeMirror-fullscreen";
 	document.documentElement.style.overflow = "hidden";
-	wrap.previousSibling.className += " fullscreen";
 	cm.refresh();
   }
 
@@ -38,7 +36,6 @@
 	var info = cm.state.fullScreenRestore;
 	wrap.style.width = info.width; wrap.style.height = info.height;
 	window.scrollTo(info.scrollLeft, info.scrollTop);
-	wrap.previousSibling.className = wrap.previousSibling.className.replace(/\s*fullscreen\b/, "");
 	cm.refresh();
   }
 });
\ No newline at end of file
diff --git a/src/js/simplemde.js b/src/js/simplemde.js
index f37ee58..e16b37d 100644
--- a/src/js/simplemde.js
+++ b/src/js/simplemde.js
@@ -96,9 +96,22 @@ function getState(cm, pos) {
  * Toggle full screen of the editor.
  */
 function toggleFullScreen(editor) {
+	// Set fullscreen
 	var cm = editor.codemirror;
 	cm.setOption("fullScreen", !cm.getOption("fullScreen"));
+	
+	
+	// Update toolbar class
+	var wrap = cm.getWrapperElement();
+	
+	if(!/fullscreen/.test(wrap.previousSibling.className)) {
+		wrap.previousSibling.className += " fullscreen";
+	} else {
+		wrap.previousSibling.className = wrap.previousSibling.className.replace(/\s*fullscreen\b/, "");
+	}
 
+	
+	// Update toolbar button
 	var toolbarButton = editor.toolbarElements.fullscreen;
 
 	if(!/active/.test(toolbarButton.className)) {