diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb
index 1a6804e..da7d27a 100644
--- a/app/controllers/measurements_controller.rb
+++ b/app/controllers/measurements_controller.rb
@@ -31,9 +31,11 @@ class MeasurementsController < ApplicationController
   def update
     if @measurement.update(measurement_params)
       flash[:notice] = 'Updated measurement'
+      prepare_measurements
+      render :index
+    else
+      render :edit
     end
-    prepare_measurements
-    render :index
   end
 
   def destroy
diff --git a/app/views/measurements/_index.html.erb b/app/views/measurements/_index.html.erb
index 6d8a3b4..fe1e549 100644
--- a/app/views/measurements/_index.html.erb
+++ b/app/views/measurements/_index.html.erb
@@ -32,15 +32,6 @@
             <%= delete_link measurement_path(m), {remote: true, data: {}} %>
           </td>
         </tr>
-        <% if (m == @measurement) && @measurement.errors.present? %>
-          <tr>
-            <td class="form" colspan="5">
-              <div id="edit-measurement">
-                <%= render partial: 'measurements/edit_form' %>
-              </div>
-            </td>
-          </tr>
-        <% end %>
       <% end %>
     </tbody>
   </table>
diff --git a/app/views/measurements/edit.js.erb b/app/views/measurements/edit.js.erb
index 25e3e76..4a375bf 100644
--- a/app/views/measurements/edit.js.erb
+++ b/app/views/measurements/edit.js.erb
@@ -1,3 +1,4 @@
 $('div[id^=flash_]').remove();
 $('#content').prepend('<%= j render_flash_messages %>');
+$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.measurement').remove();
 $('tr[id=measurement-<%= @measurement.id %>]').after('<tr><td class="form" colspan="5"><div id="edit-measurement"><%= j render partial: "measurements/edit_form" %></div></td></tr>');