diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js
index b4019e12ea..d957024e7d 100644
--- a/cms/static/js/views/settings/main_settings_view.js
+++ b/cms/static/js/views/settings/main_settings_view.js
@@ -20,6 +20,12 @@ CMS.Views.Settings.Main = Backbone.View.extend({
 		this.$el.find("#course-name").val(this.model.get('courseLocation').get('name'));
 		this.$el.find("#course-organization").val(this.model.get('courseLocation').get('org'));
 		this.$el.find("#course-number").val(this.model.get('courseLocation').get('course'));
+		this.$el.find('.set-date').datepicker({ 'dateFormat': 'm/d/yy' });
+		this.$el.find(":input, textarea").focus(function() {
+	      $("label[for='" + this.id + "']").addClass("is-focused");
+	    }).blur(function() {
+	      $("label").removeClass("is-focused");
+	    });
 		this.render();
 	},
 	
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 47bbe23e21..d49db21598 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -33,13 +33,6 @@ from contentstore import utils
             model : settingsModel
         });
         
-        $('.set-date').datepicker({ 'dateFormat': 'm/d/yy' });
-        
-	    $(":input, textarea").focus(function() {
-	      $("label[for='" + this.id + "']").addClass("is-focused");
-	    }).blur(function() {
-	      $("label").removeClass("is-focused");
-	    });
         editor.render();
     });
       
@@ -52,13 +45,6 @@ from contentstore import utils
     var gradeThresholds;
     var GRADES = ['A', 'B', 'C', 'D', 'F'];
 
-	// FIXME move into view class
-    $(" :input, textarea").focus(function() {
-      $("label[for='" + this.id + "']").addClass("is-focused");
-    }).blur(function() {
-      $("label").removeClass("is-focused");
-    });
-
     (function() {
       $body = $('body');
       $gradeBar = $('.grade-bar');