diff --git a/src/client/less/view.less b/src/client/less/view.less
index f2b45a3..dba5d21 100644
--- a/src/client/less/view.less
+++ b/src/client/less/view.less
@@ -41,4 +41,9 @@ footer {
 
 #editor-wrapper {
   font-size: 14px;
+
+  .CodeMirror-selected {
+    // The original selection background of the railscasts theme is nearly not visible
+    background: lighten(#2b2b2b, 10%) !important;
+  }
 }
diff --git a/src/server/layout/page.php b/src/server/layout/page.php
index 89c0c6f..a818cc0 100644
--- a/src/server/layout/page.php
+++ b/src/server/layout/page.php
@@ -9,6 +9,13 @@
 
   <base href="<?php echo $data['baseUrl']; ?>">
 
+  <?php if ($data['isEditMode']) { ?>
+  <!-- build:css client/edit.css -->
+  <link href="client/libs/CodeMirror/lib/codemirror.css" rel="stylesheet">
+  <link href="client/libs/CodeMirror/theme/railscasts.css" rel="stylesheet">
+  <!-- endbuild -->
+  <?php } // if $data['isEditMode'] ?>
+
   <!-- build:css client/view.css -->
   <!--
    | Styles see: https://highlightjs.org/static/demo/
@@ -20,13 +27,6 @@
   <link href=".tmp/app-view.css" rel="stylesheet" />
   <!-- endbuild -->
 
-  <?php if ($data['isEditMode']) { ?>
-  <!-- build:css client/edit.css -->
-  <link href="client/libs/CodeMirror/lib/codemirror.css" rel="stylesheet">
-  <link href="client/libs/CodeMirror/theme/railscasts.css" rel="stylesheet">
-  <!-- endbuild -->
-  <?php } // if $data['isEditMode'] ?>
-
 </head>
 <body<?php echo $data['isEditMode'] ? ' class="edit-mode"' : '' ?>>
   <?php
@@ -60,12 +60,6 @@
   </div>
 </body>
 
-<!-- build:js client/view.js -->
-<script src="client/libs/highlightjs/highlight.pack.js"></script>
-
-<script src="client/js/app-view.js"></script>
-<!-- endbuild -->
-
 <?php if ($data['isEditMode']) { ?>
 <!-- build:js client/edit.js -->
 <script src="client/libs/CodeMirror/lib/codemirror.js"></script>
@@ -86,4 +80,10 @@
 <!-- endbuild -->
 <?php } // if $data['isEditMode'] ?>
 
+<!-- build:js client/view.js -->
+<script src="client/libs/highlightjs/highlight.pack.js"></script>
+
+<script src="client/js/app-view.js"></script>
+<!-- endbuild -->
+
 </html>