diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 422c3b847a4fb67225c9b37040d9af0bfb1dd76e..77622b57f991eefa0f83fd80271c9ec475cee1f4 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -455,7 +455,7 @@ class UIRoot extends Component {
     if (!this.props.forcedVREntryType || !this.props.forcedVREntryType.endsWith("_now")) {
       this.goToEntryStep(ENTRY_STEPS.audio_setup);
     } else {
-      this.onAudioReadyButton(); // Need to wait otherwise input doesn't work :/
+      this.onAudioReadyButton();
     }
   };
 
diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index 76835383acf88ab508e3830062fe74438fef7549..f109520adbee6f715339416988eccfa502432db7 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -218,8 +218,7 @@ export default class SceneEntryManager {
     });
 
     document.addEventListener("paste", e => {
-      if ((e.target.nodeName === "INPUT" || e.target.nodeName === "TEXTAREA") && document.activeElement === e.target)
-        return;
+      if (e.matches("input, textarea") && document.activeElement === e.target) return;
 
       const url = e.clipboardData.getData("text");
       const files = e.clipboardData.files && e.clipboardData.files;