diff --git a/embark-ui/src/containers/EditorContainer.css b/embark-ui/src/containers/EditorContainer.css
index 4793f550..7ef31ba8 100644
--- a/embark-ui/src/containers/EditorContainer.css
+++ b/embark-ui/src/containers/EditorContainer.css
@@ -16,6 +16,10 @@
   background-color: #20a8d8;
 }
 
+.text-editor-container {
+  overflow: hidden;
+}
+
 .editor-aside {
   position: absolute;
   top: 0;
@@ -25,3 +29,13 @@
   overflow-x: hidden;
   overflow-y: auto;
 }
+
+@media (max-width: 768px) {
+  .editor-aside {
+    position: relative;
+  }
+
+  .aside-opened .text-editor-container {
+    max-height: 500px;
+  }
+}
diff --git a/embark-ui/src/containers/EditorContainer.js b/embark-ui/src/containers/EditorContainer.js
index 489271b6..284aba3b 100644
--- a/embark-ui/src/containers/EditorContainer.js
+++ b/embark-ui/src/containers/EditorContainer.js
@@ -8,6 +8,7 @@ import FileExplorerContainer from './FileExplorerContainer';
 import TextEditorToolbarContainer from './TextEditorToolbarContainer';
 import {fetchEditorTabs as fetchEditorTabsAction} from '../actions';
 import {getCurrentFile} from '../reducers/selectors';
+import classnames from 'classnames';
 
 import './EditorContainer.css';
 
@@ -52,27 +53,23 @@ class EditorContainer extends React.Component {
     return this.state.currentAsideTab.length ? 7 : 10;
   }
 
-  textEditorXsSize() {
-    return this.state.currentAsideTab.length ? 2 : 8;
-  }
-
   render() {
     return (
-      <Row noGutters className="h-100 editor--grid">
+      <Row noGutters className={classnames('h-100', 'editor--grid', {'aside-opened': this.state.currentAsideTab.length})}>
         <Col xs={12}>
           <TextEditorToolbarContainer openAsideTab={(newTab) => this.openAsideTab(newTab)}
                                       isContract={this.isContract()}
                                       currentFile={this.props.currentFile}
                                       activeTab={this.state.currentAsideTab}/>
         </Col>
-        <Col xs={4} md={2} xl={2} lg={2} className="border-right">
+        <Col sm={4} md={2} xl={2} lg={2} className="border-right">
           <FileExplorerContainer showHiddenFiles={this.state.showHiddenFiles} toggleShowHiddenFiles={() => this.toggleShowHiddenFiles()} />
         </Col>
-        <Col xs={this.textEditorXsSize()} md={this.textEditorMdSize()} style={{overflow: 'hidden'}}>
+        <Col sm={8} md={this.textEditorMdSize()} className="text-editor-container">
           <TextEditorContainer currentFile={this.props.currentFile} onFileContentChange={(newContent) => this.onFileContentChange(newContent)} />
         </Col>
         {this.state.currentAsideTab &&
-        <Col xs={6} md={3} className="border-left-0 relative">
+        <Col sm={12} md={3} className="border-left-0 relative">
           <div className="editor-aside">
             <TextEditorAsideContainer currentAsideTab={this.state.currentAsideTab}
                                       currentFile={this.props.currentFile}/>