diff --git a/application/controllers/admin/themeoptions.php b/application/controllers/admin/themeoptions.php
index 66acbb1fa22..3f42f3639a2 100644
--- a/application/controllers/admin/themeoptions.php
+++ b/application/controllers/admin/themeoptions.php
@@ -235,8 +235,14 @@ protected function performAjaxValidation($model)
         }
     }
 
-
-    private function _updateCommon($model,$sid=null)
+    /**
+     * Renders the template options form.
+     *
+     * @param TemplateConfiguration $model
+     * @param int $sid
+     * @return void
+     */
+    private function _updateCommon(TemplateConfiguration $model,$sid=null)
     {
         $oModelWithInheritReplacement = TemplateConfiguration::model()->findByPk($model->id);
         $templateOptionPage           = $oModelWithInheritReplacement->optionPage;
diff --git a/application/views/admin/super/fullpagebar_view.php b/application/views/admin/super/fullpagebar_view.php
index 5b744150a0c..a46b1db6903 100644
--- a/application/views/admin/super/fullpagebar_view.php
+++ b/application/views/admin/super/fullpagebar_view.php
@@ -12,7 +12,7 @@
 
 
         <!-- Right actions -->
-        <div class="col-md-4 text-right">
+        <div class="col-md-6 text-right">
 
             <!-- Save -->
             <?php if(isset($fullpagebar['savebutton']['form'])):?>
diff --git a/application/views/admin/themeoptions/update.php b/application/views/admin/themeoptions/update.php
index 3a189eb34b1..29a3b02db05 100644
--- a/application/views/admin/themeoptions/update.php
+++ b/application/views/admin/themeoptions/update.php
@@ -7,6 +7,21 @@
 
 ?>
 
+<?php if (empty($model->sid)): ?>
+    <!-- This is only visible when we're not in survey view. -->
+    <div class='container-fluid'>
+        <div class='menubar' id='theme-options-bar'>
+            <div class='row'>
+                <div class='text-right'>
+                    <a class="btn btn-success" href="#" role="button" id="save-form-button" data-form-id="template-options-form">
+                        <span class="fa fa-floppy-o"></span>
+                        <?php eT('Save'); ?>
+                    </a>
+                </div>
+            </div>
+        </div>
+<?php endif; ?>
+
 <div class="row h1"><?php echo sprintf(gT('Update survey theme options for %s'),'<em>' . $model->template_name . '</em>'); ?></div>
 <!-- Using bootstrap tabs to differ between just hte options and advanced direct settings -->
 <div class="row">
@@ -188,6 +203,10 @@
 
 </div>
 
+<?php if (empty($model->sid)): ?>
+    </div>
+<?php endif; ?>
+
 
 <script type="text/javascript">
 var progressHandling = function(event){