diff --git a/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee b/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee
index 7c7cd8ada3..a0f8cca509 100644
--- a/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectDetailsHandler.coffee
@@ -23,7 +23,8 @@ module.exports =
 				callback(err, details)
 
 	getProjectDescription: (project_id, callback)->
-		Project.find _id:project_id, "description", callback
+		Project.findOne _id:project_id, "description", (err, project)->
+			callback(err, project?.description)
 
 	setProjectDescription: (project_id, description, callback)->
 		conditions = _id:project_id
diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade
index d1e59753da..a478eeda02 100644
--- a/services/web/app/views/project/editor.jade
+++ b/services/web/app/views/project/editor.jade
@@ -102,7 +102,6 @@ block content
 				}
 			}
 		};
-		window.project_description = "#{project.description}"
 
 	script(type='text/javascript').
 		ga('send', 'event', 'editor-interaction', 'editor-opened')
diff --git a/services/web/public/coffee/ide/templates/controllers/TemplatesController.coffee b/services/web/public/coffee/ide/templates/controllers/TemplatesController.coffee
index 11fa29a4fe..238626d440 100644
--- a/services/web/public/coffee/ide/templates/controllers/TemplatesController.coffee
+++ b/services/web/public/coffee/ide/templates/controllers/TemplatesController.coffee
@@ -17,8 +17,7 @@ define [
 	App.controller "PublishProjectAsTemplateModalController", ($scope, $modalInstance, ide) ->
 		permissionsManager = new PermissionsManager(ide, $scope)
 		user_id = ide.$scope.user.id
-		$scope.template =
-			description: window.project_description
+		$scope.template = {}
 		$scope.publishedDetails =
 			exists:false
 
@@ -30,6 +29,8 @@ define [
 			ide.socket.emit "getPublishedDetails", user_id, (err, data)->
 				$scope.publishedDetails = data
 				$scope.publishedDetails.publishedDate = moment(data.publishedDate).format("Do MMM YYYY, h:mm a")
+				console.log data
+				$scope.template.description = data.description
 
 		refreshPublishedStatus()
 
diff --git a/services/web/test/UnitTests/coffee/Project/ProjectDetailsHandlerTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectDetailsHandlerTests.coffee
index 22e61b32e6..b7f0bffb10 100644
--- a/services/web/test/UnitTests/coffee/Project/ProjectDetailsHandlerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Project/ProjectDetailsHandlerTests.coffee
@@ -23,7 +23,7 @@ describe 'Project details handler', ->
 			getProject: sinon.stub().callsArgWith(2, null, @project)
 		@ProjectModel =
 			update: sinon.stub()
-			find: sinon.stub()
+			findOne: sinon.stub()
 		@UserGetter =
 			getUser: sinon.stub().callsArgWith(1, null, @user)
 		@tpdsUpdateSender =
@@ -58,15 +58,15 @@ describe 'Project details handler', ->
 	describe "getProjectDescription", ->
 
 		it "should make a call to mongo just for the description", (done)->
-			@ProjectModel.find.callsArgWith(2)
+			@ProjectModel.findOne.callsArgWith(2)
 			@handler.getProjectDescription @project_id, (err, description)=>
-				@ProjectModel.find.calledWith({_id:@project_id}, "description").should.equal true
+				@ProjectModel.findOne.calledWith({_id:@project_id}, "description").should.equal true
 				done()
 
 		it "should return what the mongo call returns", (done)->
 			err = "error"
 			description = "cool project"
-			@ProjectModel.find.callsArgWith(2, err, description)
+			@ProjectModel.findOne.callsArgWith(2, err, {description:description})
 			@handler.getProjectDescription @project_id, (returnedErr, returnedDescription)=>
 				err.should.equal returnedErr
 				description.should.equal returnedDescription