diff --git a/src/ViewerCore.tsx b/src/ViewerCore.tsx
index 8be3f99..348144a 100644
--- a/src/ViewerCore.tsx
+++ b/src/ViewerCore.tsx
@@ -173,12 +173,9 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
   }
 
   componentWillReceiveProps(nextProps: ViewerProps) {
-    if (this.state.activeIndex !== nextProps.activeIndex) {
+    if (this.state.activeIndex !== nextProps.activeIndex || (!this.props.visible && nextProps.visible)) {
       this.loadImg(nextProps.activeIndex);
     }
-    if (!this.props.visible && nextProps.visible) {
-      this.loadImg(this.props.activeIndex);
-    }
   }
 
   render() {