diff --git a/htdocs/application/views/defaults/footer.php b/htdocs/application/views/defaults/footer.php
index 5d5a5ad..738cab8 100755
--- a/htdocs/application/views/defaults/footer.php
+++ b/htdocs/application/views/defaults/footer.php
@@ -4,6 +4,11 @@
 			</div>
 		</div>	
 <?php
+
+//codemirror modes
+echo '<div style="display: none;" id="codemirror_modes">' . json_encode($codemirror_modes) . '</div>';
+
+//stats
 $this->load->view('defaults/stats');
 
 //Javascript
@@ -12,6 +17,7 @@ $this->carabiner->js('jquery.timers.js');
 $this->carabiner->js('jquery.clipboard.js');
 $this->carabiner->js('stikked.js');
 $this->carabiner->js('codemirror/codemirror.js');
+$this->carabiner->js('codemirror_exec.js');
 
 $this->carabiner->display('js');
 
diff --git a/htdocs/application/views/defaults/paste_form.php b/htdocs/application/views/defaults/paste_form.php
index b908c83..fb7c4c5 100644
--- a/htdocs/application/views/defaults/paste_form.php
+++ b/htdocs/application/views/defaults/paste_form.php
@@ -45,9 +45,7 @@
 		<div class="item">
 			<label for="paste">Your paste
 				<span class="instruction">Paste your paste here</span>
-<?php if(isset($codemirror_languages[$lang_set]) && gettype($codemirror_languages[$lang_set]) == 'array'){ ?>
-    <span class="instruction"><a href="#" id="enable_codemirror">Enable syntax highlighting</a></span>
-<?php } ?>
+                <span class="instruction"><a href="#" id="enable_codemirror">Enable syntax highlighting</a></span>
 			</label>
 			
 			<textarea id="code" name="code" cols="40" rows="20" tabindex="4"><?php if(isset($paste_set)){ echo $paste_set; }?></textarea>
diff --git a/htdocs/application/views/view/view_footer.php b/htdocs/application/views/view/view_footer.php
index a8ea5d1..8837be4 100755
--- a/htdocs/application/views/view/view_footer.php
+++ b/htdocs/application/views/view/view_footer.php
@@ -13,19 +13,9 @@ $this->carabiner->js('jquery.timers.js');
 $this->carabiner->js('jquery.clipboard.js');
 $this->carabiner->js('stikked.js');
 $this->carabiner->js('codemirror/codemirror.js');
+$this->carabiner->js('codemirror_exec.js');
 $this->carabiner->display('js');
 
-if(isset($codemirror_languages[$lang_set]) && gettype($codemirror_languages[$lang_set]) == 'array')
-{
-    $codemirror_specific = array(
-        'js' => $codemirror_languages[$lang_set]['js'],
-    );
-    $codemirror_specific['js'][] = array('codemirror_exec.js');
-    $this->carabiner->group('codemirror', $codemirror_specific);
-    $this->carabiner->display('codemirror');
-
-}
-
 ?>
 <script>
 </script>
diff --git a/htdocs/static/js/codemirror_exec.js b/htdocs/static/js/codemirror_exec.js
index a7227f2..1024664 100644
--- a/htdocs/static/js/codemirror_exec.js
+++ b/htdocs/static/js/codemirror_exec.js
@@ -1,5 +1,7 @@
 var CM = window.CM || {}
 
+CM.enabled = false;
+
 CM.init = function() {
 	CM.modes = $.parseJSON($('#codemirror_modes').text());
 	var lang = $('#lang').val();
@@ -31,11 +33,16 @@ CM.set_syntax = function(mode) {
 $(document).ready(function() {
 	$enable_codemirror = $('#enable_codemirror');
 	$enable_codemirror.click(function() {
-		CM.init();
-		$enable_codemirror.remove();
 		$('#lang').change(function() {
 			CM.init();
 		});
+		if (CM.enabled) {
+			CM.editor.toTextArea()
+			CM.enabled = false;
+		} else {
+			CM.init();
+			CM.enabled = true;
+		}
 		return false;
 	});
 });