1 files changed, 12 insertions, 4 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 929499715..0eeb5fb65 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -34,6 +34,7 @@ var ChannelInfoModal = require('../components/channel_info_modal.jsx');
 var AccessHistoryModal = require('../components/access_history_modal.jsx');
 var ActivityLogModal = require('../components/activity_log_modal.jsx');
 var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx')
+var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
 
 var AsyncClient = require('../utils/async_client.jsx');
 
@@ -54,14 +55,15 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
         id: team_id
     });
 
+    // ChannelLoader must be rendered first
     React.render(
-        <ErrorBar/>,
-        document.getElementById('error_bar')
+        <ChannelLoader/>,
+        document.getElementById('channel_loader')
     );
 
     React.render(
-        <ChannelLoader/>,
-        document.getElementById('channel_loader')
+        <ErrorBar/>,
+        document.getElementById('error_bar')
     );
 
     React.render(
@@ -224,4 +226,10 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
         document.getElementById('removed_from_channel_modal')
     );
 
+    React.render(
+        <FileUploadOverlay
+            overlayType='center' />,
+        document.getElementById('file_upload_overlay')
+    );
+
 };