diff --git a/app/controllers/stopwatch_timers_controller.rb b/app/controllers/stopwatch_timers_controller.rb
index 8337cdc..145793e 100644
--- a/app/controllers/stopwatch_timers_controller.rb
+++ b/app/controllers/stopwatch_timers_controller.rb
@@ -73,6 +73,17 @@ class StopwatchTimersController < ApplicationController
     render json: @timer.to_json
   end
 
+  def update_form
+    if id = params[:time_entry_id].presence
+      @time_entry = TimeEntry.visible.find id
+    else
+      @time_entry = TimeEntry.new
+    end
+    @time_entry.safe_attributes = params[:time_entry]
+  rescue ActiveRecord::RecordNotFound
+    head 404
+  end
+
   private
 
   def find_timer
@@ -82,7 +93,6 @@ class StopwatchTimersController < ApplicationController
 
   def find_time_entry
     @time_entry = time_entries.find params[:id]
-
   end
 
   def load_todays_entries
diff --git a/app/views/stopwatch_timers/_entry_form.html.erb b/app/views/stopwatch_timers/_entry_form.html.erb
index 653fd0c..3fed802 100644
--- a/app/views/stopwatch_timers/_entry_form.html.erb
+++ b/app/views/stopwatch_timers/_entry_form.html.erb
@@ -2,16 +2,15 @@
 
 <fieldset class="box tabular">
   <legend><%= t @time_entry.new_record? ? '.legend_new' : '.legend_edit' %></legend>
-  <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
-
-  <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true), :required => true %></p>
 
+  <p><label for="stopwatch_time_entry_project_id"><%= l :field_project %><span class="required"> *</span></label><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true), { no_label: true }, id: 'stopwatch_time_entry_project_id' %></p>
   <p>
     <%= f.text_field :issue_id, :size => 6, :required => Setting.timelog_required_fields.include?('issue_id') %>
-    <span id="time_entry_issue">
+    <span id="stopwatch_time_entry_issue">
       <%=  link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>
     </span>
   </p>
+  <p><label for="stopwatch_time_entry_activity_id"><%= l :field_activity %><span class="required"> *</span></label><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), { no_label: true }, id: 'stopwatch_time_entry_activity_id' %></p>
   <!--
   <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
   -->
@@ -30,7 +29,7 @@
     });
     $('#time_entry_project_id, #time_entry_issue_id').change(function(){
       $.ajax({
-        url: '<%= escape_javascript(@time_entry.new_record? ? new_time_entry_path(format: 'js') : edit_time_entry_path(@time_entry, format: 'js')) %>',
+        url: '<%= j update_form_stopwatch_timers_path(time_entry_id: @time_entry.id, format: 'js') %>',
         type: 'post',
         data: $(this).closest('form').serialize()
       });
diff --git a/app/views/stopwatch_timers/update_form.js.erb b/app/views/stopwatch_timers/update_form.js.erb
new file mode 100644
index 0000000..2cb2749
--- /dev/null
+++ b/app/views/stopwatch_timers/update_form.js.erb
@@ -0,0 +1,5 @@
+$('#stopwatch_time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>');
+$('#stopwatch_time_entry_issue').html('<%= escape_javascript link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>');
+$('#stopwatch_time_entry_project_id').html('<%= escape_javascript project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true) %>');
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 814cb6f..5aad544 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,7 @@
 resources :stopwatch_timers, only: %i(new create edit update) do
   collection do
     get :current
+    post :update_form
   end
   member do
     put :start