diff --git a/app/soapbox/features/ui/components/column_loading.js b/app/soapbox/features/ui/components/column_loading.js
index bc7d54941..ce0685d5e 100644
--- a/app/soapbox/features/ui/components/column_loading.js
+++ b/app/soapbox/features/ui/components/column_loading.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import Column from '../../../components/column';
 import ColumnHeader from '../../../components/column_header';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import LoadingIndicator from 'soapbox/components/loading_indicator';
 
 export default class ColumnLoading extends ImmutablePureComponent {
 
@@ -22,7 +23,7 @@ export default class ColumnLoading extends ImmutablePureComponent {
     return (
       <Column>
         <ColumnHeader icon={icon} title={title} focusable={false} />
-        <div />
+        <LoadingIndicator />
       </Column>
     );
   }
diff --git a/app/soapbox/features/ui/util/react_router_helpers.js b/app/soapbox/features/ui/util/react_router_helpers.js
index 133750f91..0b2850849 100644
--- a/app/soapbox/features/ui/util/react_router_helpers.js
+++ b/app/soapbox/features/ui/util/react_router_helpers.js
@@ -65,11 +65,19 @@ class WrappedRoute extends React.Component {
   }
 
   renderLoading = () => {
-    return <ColumnLoading />;
+    return (
+      <ColumnsAreaContainer layout={this.props.layout}>
+        <ColumnLoading />
+      </ColumnsAreaContainer>
+    );
   }
 
   renderError = (props) => {
-    return <BundleColumnError {...props} />;
+    return (
+      <ColumnsAreaContainer layout={this.props.layout}>
+        <BundleColumnError {...props} />
+      </ColumnsAreaContainer>
+    );
   }
 
   render() {