Merge "Remove on-render listener on detached"
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index 0b02245..ab706e9 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -314,12 +314,14 @@
     this.addEventListener('open-fix-preview',
         e => this._onOpenFixPreview(e));
     this.$.cursor.push('diffs', this.$.diffHost);
-
-    const onRender = () => {
-      this.$.diffHost.removeEventListener('render', onRender);
+    this._onRenderHandler = () => {
       this.$.cursor.reInitCursor();
     };
-    this.$.diffHost.addEventListener('render', onRender);
+    this.$.diffHost.addEventListener('render', this._onRenderHandler);
+  }
+
+  detached() {
+    this.$.diffHost.removeEventListener('render', this._onRenderHandler);
   }
 
   _getLoggedIn() {