diff --git a/packages/@sanity/desk-tool/src/DeskToolPanes.js b/packages/@sanity/desk-tool/src/DeskToolPanes.js
index 8a49328b86a..0ce63cf5745 100644
--- a/packages/@sanity/desk-tool/src/DeskToolPanes.js
+++ b/packages/@sanity/desk-tool/src/DeskToolPanes.js
@@ -366,6 +366,7 @@ export default class DeskToolPanes extends React.Component {
                 ) : (
                   <Pane
                     key={paneKey} // Use key to force rerendering pane on ID change
+                    paneKey={paneKey}
                     index={i}
                     itemId={keys[i]}
                     onExpand={this.handlePaneExpand}
diff --git a/packages/@sanity/desk-tool/src/pane/DocumentPane.js b/packages/@sanity/desk-tool/src/pane/DocumentPane.js
index 46f8e438dd7..09bf7643683 100644
--- a/packages/@sanity/desk-tool/src/pane/DocumentPane.js
+++ b/packages/@sanity/desk-tool/src/pane/DocumentPane.js
@@ -40,11 +40,6 @@ import EditorStatusBadge from './EditorStatusBadge'
 import {getProductionPreviewItem, getMenuItems} from './documentPaneMenuItems'
 import {validateDocument} from '@sanity/validation'
 
-function noop() {
-  // eslint-disable-next-line no-console
-  console.warn('No handler defined for action')
-}
-
 // Want a nicer api for listen/unlisten
 function listen(target, eventType, callback, useCapture = false) {
   target.addEventListener(eventType, callback, useCapture)
@@ -184,9 +179,11 @@ export default withInitialValue(
     static propTypes = {
       styles: PropTypes.object, // eslint-disable-line react/forbid-prop-types
       title: PropTypes.string,
+      paneKey: PropTypes.string.isRequired,
       type: PropTypes.string.isRequired,
       isSelected: PropTypes.bool.isRequired,
       isCollapsed: PropTypes.bool.isRequired,
+      isClosable: PropTypes.bool.isRequired,
       onExpand: PropTypes.func,
       onCollapse: PropTypes.func,
       menuItems: PropTypes.arrayOf(
@@ -1083,7 +1080,8 @@ export default withInitialValue(
         onExpand,
         menuItemGroups,
         views,
-        options
+        options,
+        paneKey
       } = this.props
 
       const {
@@ -1195,7 +1193,7 @@ export default withInitialValue(
           )}
           <TabbedPane
             key="pane"
-            idPrefix={`${getPublishedId(value._id)}-`}
+            idPrefix={paneKey}
             title={this.getTitle(value)}
             views={views}
             activeView={activeViewId}