diff --git a/bazarr/api.py b/bazarr/api.py
index 41f362146..c61da14bf 100644
--- a/bazarr/api.py
+++ b/bazarr/api.py
@@ -381,6 +381,8 @@ class Series(Resource):
 
         list_missing_subtitles(no=seriesId)
 
+        event_stream(type='series', action='update', series=seriesId)
+
         return '', 204
 
 
@@ -909,6 +911,8 @@ class Movies(Resource):
 
         list_missing_subtitles_movies(no=radarrId)
 
+        event_stream(type='movies', action='update', movie=radarrId)
+
         return '', 204
 
 
diff --git a/views/episodes.html b/views/episodes.html
index 091c7b477..8524dce91 100644
--- a/views/episodes.html
+++ b/views/episodes.html
@@ -275,7 +275,7 @@
                         <input type="hidden" id="edit_sonarrSeriesId" name="sonarrSeriesId" value=""/>
                     </div>
                     <div class="modal-footer">
-                        <button type="submit" id="edit_save_button" class="btn btn-info">Save</button>
+                        <button type="submit" id="edit_save_button" class="btn btn-info"><span id="edit_save_button_span">Save</span></button>
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
                     </div>
                 </form>
@@ -829,9 +829,13 @@
                     processData: false,
                     contentType: false,
                     type: 'POST',
+                    beforeSend: function () {
+                        $('#edit_save_button_span').html('<div class="spinner-border spinner-border-sm" role="status"><span class="sr-only">Loading...</span></div>');
+                    },
                     success: function () {
                         seriesDetailsRefresh();
                         $('#editModal').modal('hide');
+                        $('#edit_save_button_span').html('Save');
                     }
                 });
             });
diff --git a/views/movie.html b/views/movie.html
index 123cff743..90f4719da 100644
--- a/views/movie.html
+++ b/views/movie.html
@@ -278,7 +278,7 @@
 					<input type="hidden" id="edit_radarrId" name="radarrId" value="" />
 				</div>
 				<div class="modal-footer">
-					<button type="submit" id="edit_save_button" class="btn btn-info">Save</button>
+					<button type="submit" id="edit_save_button" class="btn btn-info"><span id="edit_save_button_span">Save</span></button>
 					<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
 				</div>
 			</form>
@@ -678,9 +678,13 @@
 				processData: false,
 				contentType: false,
 				type: 'POST',
+				beforeSend: function () {
+					$('#edit_save_button_span').html('<div class="spinner-border spinner-border-sm" role="status"><span class="sr-only">Loading...</span></div>');
+				},
 				success: function(){
 					movieDetailsRefresh();
 					$('#editModal').modal('hide');
+					$('#edit_save_button_span').html('Save');
 				}
 			});
 		});
diff --git a/views/movies.html b/views/movies.html
index 19d2a75b0..482206dcf 100644
--- a/views/movies.html
+++ b/views/movies.html
@@ -90,7 +90,7 @@
                         <input type="hidden" id="edit_radarrId" name="radarrId" value=""/>
                     </div>
                     <div class="modal-footer">
-                        <button type="submit" id="edit_save_button" class="btn btn-info">Save</button>
+                        <button type="submit" id="edit_save_button" class="btn btn-info"><span id="edit_save_button_span">Save</span></button>
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
                     </div>
                 </form>
@@ -278,8 +278,12 @@
                 processData: false,
                 contentType: false,
                 type: 'POST',
+                beforeSend: function () {
+                    $('#edit_save_button_span').html('<div class="spinner-border spinner-border-sm" role="status"><span class="sr-only">Loading...</span></div>');
+                },
                 success: function () {
                     $('#editModal').modal('hide');
+                    $('#edit_save_button_span').html('Save');
                 }
             });
         });
diff --git a/views/series.html b/views/series.html
index e702ddb68..ad3afab83 100644
--- a/views/series.html
+++ b/views/series.html
@@ -89,7 +89,7 @@
                         <input type="hidden" id="edit_sonarrSeriesId" name="sonarrSeriesId" value=""/>
                     </div>
                     <div class="modal-footer">
-                        <button type="submit" id="edit_save_button" class="btn btn-info">Save</button>
+                        <button type="submit" id="edit_save_button" class="btn btn-info"><span id="edit_save_button_span">Save</span></button>
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
                     </div>
                 </form>
@@ -268,8 +268,12 @@
                 processData: false,
                 contentType: false,
                 type: 'POST',
+                beforeSend: function () {
+                    $('#edit_save_button_span').html('<div class="spinner-border spinner-border-sm" role="status"><span class="sr-only">Loading...</span></div>');
+                },
                 success: function () {
                     $('#editModal').modal('hide');
+                    $('#edit_save_button_span').html('Save');
                 }
             });
         });