diff --git a/templates/zephyr/base.html b/templates/zephyr/base.html
index 680db16be7..6d09ad08e0 100644
--- a/templates/zephyr/base.html
+++ b/templates/zephyr/base.html
@@ -6,10 +6,12 @@
     <title>Zephyr</title>
     <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <link href="/static/styles/zephyr.css" rel="stylesheet">
+    {# We need to import jQuery before Bootstrap #}
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+    <script src="/static/bootstrap/js/bootstrap.min.js"></script>
 </head>
 
 <body>
-<script src="/static/bootstrap/js/bootstrap.min.js"></script>
 
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 5639a1367b..9a11ca5385 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -7,8 +7,6 @@
 {% block content %}
 <h1>Hello {{ user_profile.user.username }}!</h1>
 
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-
 <script type="text/javascript">
 $.ajaxSetup({
      beforeSend: function(xhr, settings) {
