diff --git a/client/modules/IDE/components/FileUploader.js b/client/modules/IDE/components/FileUploader.js
index 8fd41652..d6943dda 100644
--- a/client/modules/IDE/components/FileUploader.js
+++ b/client/modules/IDE/components/FileUploader.js
@@ -7,7 +7,11 @@ import { connect } from 'react-redux';
 
 class FileUploader extends React.Component {
   componentDidMount() {
+    this.createDropzone();
     Dropzone.autoDiscover = false;
+  }
+
+  createDropzone() {
     this.uploader = new Dropzone('div#uploader', {
       url: s3Bucket,
       method: 'post',
diff --git a/client/modules/IDE/pages/IDEView.js b/client/modules/IDE/pages/IDEView.js
index 6987b726..b5a40357 100644
--- a/client/modules/IDE/pages/IDEView.js
+++ b/client/modules/IDE/pages/IDEView.js
@@ -86,10 +86,17 @@ class IDEView extends React.Component {
           }
           isPlaying={this.props.ide.isPlaying}
         />
-        <NewFileModal
-          isVisible={this.props.ide.modalIsVisible}
-          closeModal={this.props.closeNewFileModal}
-        />
+        {(() => {
+          if (this.props.ide.modalIsVisible) {
+            return (
+              <NewFileModal
+                isVisible={this.props.ide.modalIsVisible}
+                closeModal={this.props.closeNewFileModal}
+              />
+            );
+          }
+          return '';
+        })()}
       </div>
     );
   }