diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 8f9d47d..765a9bf 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -75,6 +75,14 @@ module TimelogHelper
     end
   end
 
+  def format_issue_subject(issue)
+    if issue.try(:visible?)
+      "#{issue.tracker.name} ##{issue.id}: #{issue.subject}"
+    else
+      ''
+    end
+  end
+
   def report_to_csv(report)
     Redmine::Export::CSV.generate do |csv|
       # Column headers
diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
index ebd9d39..a09a6e1 100644
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -13,9 +13,9 @@
   <% end %>
   <p>
     <%= f.text_field :issue_id, :size => 6 %>
-    <% if @time_entry.issue.try(:visible?) %>
-      <span id="time_entry_issue"><%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %></span>
-    <% end %>
+    <span id="time_entry_issue">
+      <%=  format_issue_subject(@time_entry.issue) %>
+    </span>
   </p>
   <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
   <p><%= f.text_field :hours, :size => 6, :required => true %></p>
diff --git a/app/views/timelog/new.js.erb b/app/views/timelog/new.js.erb
index f76cbb8..b824f62 100644
--- a/app/views/timelog/new.js.erb
+++ b/app/views/timelog/new.js.erb
@@ -1 +1,2 @@
 $('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>');
+$('#time_entry_issue').html('<%= escape_javascript format_issue_subject(@time_entry.issue) %>');