diff --git a/core/client.js b/core/client.js
index ad6b1fbe..49e6e1e4 100644
--- a/core/client.js
+++ b/core/client.js
@@ -290,7 +290,7 @@ class TfFilesPaneElement extends LitElement {
 			</div>` :
 			html`<div class="w3-button w3-bar-item w3-blue" @click=${() => self.set_expanded(true)}>»</div>`;
 		let content = html`
-			<tf-files style="flex: 1 1; overflow: scroll" .files=${self.files} current=${self.current} @file_click=${event => openFile(event.detail.file)}></tf-files>
+			<tf-files style="flex: 1 1; overflow: auto" .files=${self.files} current=${self.current} @file_click=${event => openFile(event.detail.file)}></tf-files>
 			<div><button class="w3-bar-item w3-button w3-blue" style="width: 100%; flex: 0 0" @click=${() => newFile()} accesskey="n" @mouseover=${set_access_key_title} data-tip="Add a new, empty file to the app">📄 New File</button></div>
 			<div><button class="w3-bar-item w3-button w3-blue" style="width: 100%; flex: 0 0" @click=${() => removeFile()} accesskey="r" @mouseover=${set_access_key_title} data-tip="Remove the selected file from the app">🚮 Remove File</button></div>
 		`;
diff --git a/core/index.html b/core/index.html
index 231e9d74..c6cc65ff 100644
--- a/core/index.html
+++ b/core/index.html
@@ -16,8 +16,8 @@
 	</head>
 	<body style="display: flex; flex-flow: column; width: 100vw; height: 100vh; position: absolute; max-width: 100%; max-height: 100%">
 		<tf-navigation></tf-navigation>
-		<div id="content" class="hbox" style="flex: 1 0; overflow: scroll">
-			<div id="editPane" class="vbox" style="flex: 0 1 100%; display: none; overflow: scroll">
+		<div id="content" class="hbox" style="flex: 1 0; overflow: auto">
+			<div id="editPane" class="vbox" style="flex: 0 1 100%; display: none; overflow: auto">
 				<div class="navigation w3-bar" style="display: flex">
 					<button class="w3-bar-item w3-button w3-blue" id="closeEditor" name="closeEditor" accesskey="c" onmouseover="set_access_key_title(event)" data-tip="Close the editor">Close</button>
 					<button class="w3-bar-item w3-button w3-blue" id="save" name="save" accesskey="s" onmouseover="set_access_key_title(event)" data-tip="Save the app under the given path">Save</button>
@@ -28,14 +28,14 @@
 					<button class="w3-bar-item w3-button w3-blue" id="delete" name="delete" accesskey="d" onmouseover="set_access_key_title(event)" data-tip="Delete the app">Delete</button>
 					<button class="w3-bar-item w3-button w3-blue" id="trace_button" accesskey="t" onmouseover="set_access_key_title(event)" data-tip="Open a performance trace for the server">Trace</button>
 				</div>
-				<div class="hbox" style="flex: 1 1; overflow: scroll">
-					<div style="overflow: scroll">
-						<tf-files-pane style="overflow: scroll"></tf-files-pane>
+				<div class="hbox" style="flex: 1 1; overflow: auto">
+					<div style="overflow: auto">
+						<tf-files-pane style="overflow: auto"></tf-files-pane>
 					</div>
-					<div style="flex: 1 1; overflow: scroll"><div id="editor" style="width: 100%; height: 100%"></div></div>
+					<div style="flex: 1 1; overflow: auto"><div id="editor" style="width: 100%; height: 100%"></div></div>
 				</div>
 			</div>
-			<div id="viewPane" class="vbox" style="flex: 0 1 100%; overflow: scroll">
+			<div id="viewPane" class="vbox" style="flex: 0 1 100%; overflow: auto">
 				<iframe id="document" sandbox="allow-forms allow-scripts allow-top-navigation allow-modals allow-popups allow-downloads" style="width: 100%; height: 100%; border: 0"></iframe>
 			</div>
 		</div>
