diff --git a/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/model.js b/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/model.js
index 1a27fa4401..0fe27a0646 100644
--- a/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/model.js
+++ b/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/model.js
@@ -312,7 +312,10 @@ RB.Model = (function ($) {
 
       if (!j.hasClass('editing') && !j.hasClass('dragging') && !j.hasClass('prevent_edit') && !$(e.target).hasClass('prevent_edit')) {
         editor = model.edit();
-        editor.find('.' + $(e.currentTarget).attr('fieldname') + '.editor').focus();
+        var input = editor.find('.' + $(e.currentTarget).attr('fieldname') + '.editor');
+
+        input.focus();
+        input.click();
       }
     },
 
diff --git a/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/story.js b/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/story.js
index 86fc3d5fb5..48c5250920 100644
--- a/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/story.js
+++ b/frontend/src/app/modules/augmenting/dynamic-scripts/backlogs/story.js
@@ -37,7 +37,7 @@ RB.Story = (function ($) {
 
       // Associate this object with the element for later retrieval
       this.$.data('this', this);
-      this.$.on('mouseup', '.editable', this.handleClick);
+      this.$.on('click', '.editable', this.handleClick);
     },
 
     /**
diff --git a/modules/backlogs/app/views/rb_sprints/_sprint.html.erb b/modules/backlogs/app/views/rb_sprints/_sprint.html.erb
index ee8b8d4dc8..d993baea0a 100644
--- a/modules/backlogs/app/views/rb_sprints/_sprint.html.erb
+++ b/modules/backlogs/app/views/rb_sprints/_sprint.html.erb
@@ -54,7 +54,7 @@ See docs/COPYRIGHT.rdoc for more details.
       <%= text_field_tag :start_date,
                          sprint.start_date,
                          id: "start_date_#{sprint.id}",
-                         class: '-augmented-datepicker effective_date editor' %>
+                         class: '-augmented-datepicker start_date editor' %>
       <%= text_field_tag :name,
                          sprint.name,
                          class: 'name editor' %>