diff --git a/mirador b/mirador
index 1a9ef869f8868c6983ba5e465da63598b14d2d8e..9f36a451d213fffb794e41198bc312e2b9cfa80e 160000
--- a/mirador
+++ b/mirador
@@ -1 +1 @@
-Subproject commit 1a9ef869f8868c6983ba5e465da63598b14d2d8e
+Subproject commit 9f36a451d213fffb794e41198bc312e2b9cfa80e
diff --git a/src/ImageFormField.js b/src/ImageFormField.js
index 5fe3d13796d9daf52ed274780063bb7e35f9b09d..b5583a644eb2e0b9c83a632349e417f7b6a8376f 100644
--- a/src/ImageFormField.js
+++ b/src/ImageFormField.js
@@ -19,7 +19,7 @@ function ImageFormField({ value: image, onChange }) {
     } else {
       setImgIsValid(!!image.id);
     }
-  }, [image]);
+}, [image]);
 
   const imgUrl = image.id === null ? '' : image.id;
 
diff --git a/src/plugins/canvasAnnotationsPlugin.js b/src/plugins/canvasAnnotationsPlugin.js
index 4366188db7eec09b9b7c0d66e3da18138202470b..dee3bb9b02dc3d1345e61689b1284b31b54c174f 100644
--- a/src/plugins/canvasAnnotationsPlugin.js
+++ b/src/plugins/canvasAnnotationsPlugin.js
@@ -30,7 +30,7 @@ class CanvasAnnotationsWrapper extends Component {
   render() {
     const {
       addCompanionWindow, annotationsOnCanvases, canvases, config, receiveAnnotation,
-      switchToSingleCanvasView, TargetComponent, targetProps, windowViewType,
+      switchToSingleCanvasView, TargetComponent, targetProps, windowViewType, containerRef,
     } = this.props;
     const { singleCanvasDialogOpen } = this.state;
 
@@ -55,6 +55,7 @@ class CanvasAnnotationsWrapper extends Component {
       >
         <TargetComponent
           {...props}
+          ref={containerRef}
         />
         {windowViewType !== 'single' && (
           <SingleCanvasDialog
@@ -79,6 +80,10 @@ CanvasAnnotationsWrapper.propTypes = {
       adapter: PropTypes.func,
     }),
   }).isRequired,
+  containerRef: PropTypes.oneOfType([
+    PropTypes.func,
+    PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
+  ]),
   receiveAnnotation: PropTypes.func.isRequired,
   switchToSingleCanvasView: PropTypes.func.isRequired,
   TargetComponent: PropTypes.oneOfType([
@@ -92,6 +97,7 @@ CanvasAnnotationsWrapper.propTypes = {
 CanvasAnnotationsWrapper.defaultProps = {
   annotationsOnCanvases: {},
   canvases: [],
+  containerRef: null,
 };
 
 /** */