diff --git a/modules/ui/photoviewer.js b/modules/ui/photoviewer.js
index 70340d2af..71cbf2da1 100644
--- a/modules/ui/photoviewer.js
+++ b/modules/ui/photoviewer.js
@@ -64,10 +64,13 @@ export function uiPhotoviewer(context) {
                 buildResizeListener(selection, 'resize', dispatch, { resizeOnY: true })
             );
 
-        // set_photo_from_viewer button
+        // update sett_photo_from_viewer button on selection change and when tags change
         context.features().on('change.setPhotoFromViewer', function() {
             setPhotoFromViewerButton();
         });
+        context.history().on('change.setPhotoFromViewer', function() {
+            setPhotoFromViewerButton();
+        });
 
 
         function setPhotoFromViewerButton() {