diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 3176bda8996f424ef5ec0d304c5ebf6d3c8aa655..e120278a05bf9f82cb5cae855a34f4c508585192 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -215,7 +215,8 @@ class Status extends ImmutablePureComponent {
   }
 
   handleHotkeyOpenMedia = e => {
-    const { status, onOpenMedia, onOpenVideo } = this.props;
+    const { onOpenMedia, onOpenVideo } = this.props;
+    const status = this._properStatus();
 
     e.preventDefault();
 
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index ab468b5e8debf58f6c724d975489a7c051b1de72..6b18f34d18fea0a2cd9e2e12b01a381b476a9e34 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -282,7 +282,7 @@ class Status extends ImmutablePureComponent {
   }
 
   handleHotkeyOpenMedia = e => {
-    const { status } = this.props;
+    const status = this._properStatus();
 
     e.preventDefault();