diff --git a/CHANGES.md b/CHANGES.md
index b8b77219..043384e3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,8 @@ Version 1.18
 ===========
 
 General
+-------
+* Fix "Show all data" shortcut from popup [issue 96](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/96) (fix by [Pietro Martino](https://github.com/pietromartino))
 
 Version 1.17
 ===========
diff --git a/addon/popup.js b/addon/popup.js
index 88c48ce4..be16c9d4 100644
--- a/addon/popup.js
+++ b/addon/popup.js
@@ -60,11 +60,11 @@ class App extends React.PureComponent {
   onShortcutKey(e) {
     if (e.key == "m") {
       e.preventDefault();
-      this.refs.showAllDataBox.clickShowDetailsBtn();
+      this.refs.showAllDataBox.refs?.showAllDataBoxSObject?.clickShowDetailsBtn();
     }
     if (e.key == "a") {
       e.preventDefault();
-      this.refs.showAllDataBox.clickAllDataBtn();
+      this.refs.showAllDataBox.refs?.showAllDataBoxSObject?.clickAllDataBtn();
     }
     if (e.key == "e") {
       e.preventDefault();