diff --git a/src/containers/ViewerInfo.js b/src/containers/ViewerInfo.js
index 6aacacb19b2baa8b0fc1e1cfb0881a1a39839658..7e2714d9b7880b574dea33859bb272bd98445394 100644
--- a/src/containers/ViewerInfo.js
+++ b/src/containers/ViewerInfo.js
@@ -5,7 +5,7 @@ import { withStyles } from '@material-ui/core/styles';
 import { withPlugins } from '../extend/withPlugins';
 import { ViewerInfo } from '../components/ViewerInfo';
 import {
-  getCanvasLabel, getCanvases, getCanvasIndex, getVisibleCanvasIds
+  getCanvasLabel, getCanvases, getCanvasIndex, getCurrentCanvas,
 } from '../state/selectors';
 
 /**
@@ -17,7 +17,7 @@ const mapStateToProps = (state, props) => {
   const { windowId } = props;
   const canvases = getCanvases(state, { windowId });
   const canvasIndex = getCanvasIndex(state, { windowId });
-  const canvasId = getVisibleCanvasIds(state, { windowId })[0];
+  const canvasId = (getCurrentCanvas(state, { windowId }) || {}).id;
 
   return {
     canvasCount: canvases.length,