diff --git a/core/client/components/gh-codemirror.js b/core/client/components/gh-codemirror.js
index b9637e614a..502ff690e5 100644
--- a/core/client/components/gh-codemirror.js
+++ b/core/client/components/gh-codemirror.js
@@ -45,9 +45,14 @@ var Codemirror = Ember.TextArea.extend(MarkerManager, {
         var initMarkers = _.bind(this.initMarkers, this);
 
         // Allow tabbing behaviour when viewing on small screen (not mobile)
-        $('.floatingheader').on('click', function () {
-            $('.entry-markdown').toggleClass('active');
-            $('.entry-preview').toggleClass('active');
+        $('#entry-markdown-header').on('click', function () {
+            $('.entry-markdown').addClass('active');
+            $('.entry-preview').removeClass('active');
+        });
+
+        $('#entry-preview-header').on('click', function () {
+            $('.entry-markdown').removeClass('active');
+            $('.entry-preview').addClass('active');
         });
 
         // replaces CodeMirror with TouchEditor only if we're on mobile
diff --git a/core/client/templates/editor/edit.hbs b/core/client/templates/editor/edit.hbs
index c9f2cd9abf..5340200025 100644
--- a/core/client/templates/editor/edit.hbs
+++ b/core/client/templates/editor/edit.hbs
@@ -5,7 +5,7 @@
 </header>
 
 <section class="entry-markdown active">
-    <header class="floatingheader">
+    <header class="floatingheader" id="entry-markdown-header">
         <small>Markdown</small>
         <a class="markdown-help" href="" {{action "openModal" "markdown"}}><span class="hidden">What is Markdown?</span></a>
     </header>
@@ -15,7 +15,7 @@
 </section>
 
 <section class="entry-preview">
-    <header class="floatingheader">
+    <header class="floatingheader" id="entry-preview-header">
         <small>Preview <span class="entry-word-count js-entry-word-count">{{gh-count-words scratch}}</span></small>
     </header>
     <section class="entry-preview-content">
diff --git a/core/client/utils/codemirror-mobile.js b/core/client/utils/codemirror-mobile.js
index 565729bd50..1a8242142e 100644
--- a/core/client/utils/codemirror-mobile.js
+++ b/core/client/utils/codemirror-mobile.js
@@ -29,11 +29,17 @@ init = function init() {
         $('body').addClass('touch-editor');
 
         // make editor tabs touch-to-toggle in portrait mode
-        $('.floatingheader').on('tap', function () {
-            $('.entry-markdown').toggleClass('active');
-            $('.entry-preview').toggleClass('active');
+        $('#entry-markdown-header').on('tap', function () {
+            $('.entry-markdown').addClass('active');
+            $('.entry-preview').removeClass('active');
         });
 
+        $('#entry-preview-header').on('tap', function () {
+            $('.entry-markdown').removeClass('active');
+            $('.entry-preview').addClass('active');
+        });
+
+
         Ember.touchEditor = true;
         //initialize FastClick to remove touch delays
         Ember.run.scheduleOnce('afterRender', null, function () {