diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 33f8352f57..fe7dad04a8 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -9,8 +9,7 @@
         </div>
         </fieldset>
     <% end %>
-    <% if User.current.allowed_to?(:log_time, @project) %>
-        <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
+      <fieldset id="log_time" class="tabular<%= ' hidden' unless User.current.allowed_to?(:log_time, @project) %>"><legend><%= l(:button_log_time) %></legend>
         <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
         <div class="splitcontent">
         <div class="splitcontentleft">
@@ -25,8 +24,7 @@
           <p><%= custom_field_tag_with_label :time_entry, value %></p>
         <% end %>
         <% end %>
-    </fieldset>
-    <% end %>
+      </fieldset>
     <% if @issue.notes_addable? %>
       <fieldset><legend><%= l(:field_notes) %></legend>
       <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit',
diff --git a/app/views/issues/edit.js.erb b/app/views/issues/edit.js.erb
index 8c94aecebd..ef04553e0c 100644
--- a/app/views/issues/edit.js.erb
+++ b/app/views/issues/edit.js.erb
@@ -1,7 +1,7 @@
 replaceIssueFormWith('<%= escape_javascript(render :partial => 'form') %>');
 
 <% if User.current.allowed_to?(:log_time, @issue.project) %>
-  $('#log_time').show();
+  $('#log_time').removeClass('hidden');
 <% else %>
-  $('#log_time').hide();
+  $('#log_time').addClass('hidden');
 <% end %>
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index a8296b9bc3..7d17098768 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -5551,14 +5551,18 @@ class IssuesControllerTest < Redmine::ControllerTest
     @request.session[:user_id] = 2
     Role.find_by_name('Manager').update_attribute :permissions, [:view_issues, :edit_issues, :log_time]
     get(:edit, :params => {:id => 1})
-    assert_select 'input[name=?]', 'time_entry[hours]'
+    assert_select '#log_time:not(.hidden)' do
+      assert_select 'input[name=?]', 'time_entry[hours]'
+    end
   end
 
   def test_get_edit_should_not_display_the_time_entry_form_without_log_time_permission
     @request.session[:user_id] = 2
     Role.find_by_name('Manager').remove_permission! :log_time
     get(:edit, :params => {:id => 1})
-    assert_select 'input[name=?]', 'time_entry[hours]', 0
+    assert_select '#log_time.hidden' do
+      assert_select 'input[name=?]', 'time_entry[hours]'
+    end
   end
 
   def test_get_edit_with_params
diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index f1f355d0d0..6b12e4a687 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -571,4 +571,48 @@ class IssuesSystemTest < ApplicationSystemTestCase
       assert page.has_text? 'Related to Bug #7'
     end
   end
+
+  def test_edit_should_show_log_time_block_dynamically
+    project = Project.find('ecookbook') # eCookbook
+    project.enabled_module_names = project.enabled_module_names - ['time_tracking']
+    project.save!
+    Member.create!(:project => Project.find('subproject1'), :roles => [Role.find_by_name('Manager')], :principal => User.find_by_login('dlopper'))
+
+    log_user('dlopper', 'foo')
+
+    visit '/issues/1'
+    page.first(:link, 'Edit').click
+
+    within('#issue-form') do
+      assert page.has_select?('Project', :with_options => ['eCookbook', 'eCookbook Subproject 1'])
+      assert page.has_select?('Project', :selected => 'eCookbook')
+      assert page.has_selector?('#log_time.hidden', :visible => false)
+
+      select 'eCookbook Subproject 1', :from => 'Project'
+      assert page.has_select?('Project', :selected => '  » eCookbook Subproject 1')
+      assert page.has_selector?('#log_time', :visible => true)
+    end
+  end
+
+  def test_edit_should_hide_log_time_block_dynamically
+    project = Project.find('subproject1') # eCookbook Subproject 1
+    project.enabled_module_names = project.enabled_module_names - ['time_tracking']
+    project.save!
+    Member.create!(:project => project, :roles => [Role.find_by_name('Manager')], :principal => User.find_by_login('dlopper'))
+
+    log_user('dlopper', 'foo')
+
+    visit '/issues/1'
+    page.first(:link, 'Edit').click
+
+    within('#issue-form') do
+      assert page.has_select?('Project', :with_options => ['eCookbook', 'eCookbook Subproject 1'])
+      assert page.has_select?('Project', :selected => 'eCookbook')
+      assert page.has_selector?('#log_time', :visible => true)
+
+      select 'eCookbook Subproject 1', :from => 'Project'
+      assert page.has_select?('Project', :selected => '  » eCookbook Subproject 1')
+      assert page.has_selector?('#log_time.hidden', :visible => false)
+    end
+  end
 end