diff --git a/internal/js/view_support.js b/internal/js/view_support.js
index 647e65d..9ae1d02 100644
--- a/internal/js/view_support.js
+++ b/internal/js/view_support.js
@@ -161,6 +161,8 @@ function ViewImageOrVideo()
         $('#figure').show()
         if( fullscreen )
             $('#canvas').get(0).requestFullscreen()
+        else
+            document.exitFullscreen()
     }
     if( objs[current].type == 'Video' )
     {
@@ -173,5 +175,7 @@ function ViewImageOrVideo()
         $('#video_div').show()
         if( fullscreen )
             $('#video').get(0).requestFullscreen()
+        else
+            document.exitFullscreen()
     }
 }