diff --git a/src/components/components/AddComponent.js b/src/components/components/AddComponent.js
index 7d9bb8ec..4f175dd5 100644
--- a/src/components/components/AddComponent.js
+++ b/src/components/components/AddComponent.js
@@ -64,7 +64,14 @@ export default class AddComponent extends React.Component {
   getComponentsOptions() {
     const usedComponents = Object.keys(this.props.entity.components);
     return Object.keys(AFRAME.components)
-      .filter(function (componentName) {
+      .filter((componentName) => {
+        if (
+          AFRAME.components[componentName].sceneOnly &&
+          !this.props.entity.isScene
+        ) {
+          return false;
+        }
+
         return (
           AFRAME.components[componentName].multiple ||
           usedComponents.indexOf(componentName) === -1