diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js
index 4c6b934c..68a47449 100644
--- a/src/octoprint/static/js/app/main.js
+++ b/src/octoprint/static/js/app/main.js
@@ -289,6 +289,12 @@ $(function() {
             }
         }
 
+        ko.bindingHandlers.allowBindings = {
+        	init: function (elem, valueAccessor) {
+        		return { controlsDescendantBindings: !valueAccessor() };
+        	}
+        };
+
         ko.applyBindings(connectionViewModel, document.getElementById("connection_accordion"));
         ko.applyBindings(printerStateViewModel, document.getElementById("state_accordion"));
         ko.applyBindings(gcodeFilesViewModel, document.getElementById("files_accordion"));
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index cae0178a..9932458f 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -253,7 +253,6 @@
                         {% if enableGCodeVisualizer %}<li><a href="#gcode" data-toggle="tab">GCode Viewer</a></li>{% endif %}
                         <li><a href="#term" data-toggle="tab">Terminal</a></li>
                         {% if enableTimelapse %}<li><a href="#timelapse" data-toggle="tab">Timelapse</a></li>{% endif %}
-                       <li><a href="#logs" data-toggle="tab">Logs</a></li>
                     </ul>
 
                     <div class="tab-content">
@@ -587,40 +586,6 @@
                             </div>
                         </div>
                         {% endif %}
-                        <div class="tab-pane" id="logs">
-                            <h1>Logs</h1>
-
-                            <div class="pull-right">
-                                <small>Sort by: <a href="#" data-bind="click: function() { listHelper.changeSorting('name'); }">Name (ascending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('creation'); }">Creation date (descending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('size'); }">Size (descending)</a></small>
-                            </div>
-                            <table class="table table-striped table-hover table-condensed table-hover" id="log_files">
-                                <thead>
-                                    <tr>
-                                        <th class="log_files_name">Name</th>
-                                        <th class="log_files_size">Size</th>
-                                        <th class="log_files_action">Action</th>
-                                    </tr>
-                                </thead>
-                                <tbody data-bind="foreach: listHelper.paginatedItems">
-                                    <tr data-bind="attr: {title: name}">
-                                        <td class="log_files_name" data-bind="text: name"></td>
-                                        <td class="log_files_size" data-bind="text: size"></td>
-                                        <td class="log_files_action"><a href="#" class="icon-trash" data-bind="click: function() { if ($root.loginState.isUser()) { $parent.removeFile($data.name); } else { return; } }, css: {disabled: !$root.loginState.isUser()}"></a>&nbsp;|&nbsp;<a href="#" class="icon-download" data-bind="attr: {href: url}"></a></td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            <div class="pagination pagination-mini pagination-centered">
-                                <ul>
-                                    <li data-bind="css: {disabled: listHelper.currentPage() === 0}"><a href="#" data-bind="click: listHelper.prevPage">«</a></li>
-                                </ul>
-                                <ul data-bind="foreach: listHelper.pages">
-                                    <li data-bind="css: { active: $data.number === $root.listHelper.currentPage(), disabled: $data.number === -1 }"><a href="#" data-bind="text: $data.text, click: function() { $root.listHelper.changePage($data.number); }"></a></li>
-                                </ul>
-                                <ul>
-                                    <li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}"><a href="#" data-bind="click: listHelper.nextPage">»</a></li>
-                                </ul>
-                            </div>
-                        </div>
                     </div>
                 </div>
             </div>
diff --git a/src/octoprint/templates/settings.jinja2 b/src/octoprint/templates/settings.jinja2
index a2f8e2ac..5437d55a 100644
--- a/src/octoprint/templates/settings.jinja2
+++ b/src/octoprint/templates/settings.jinja2
@@ -20,6 +20,7 @@
                 <li class="nav-header">OctoPrint</li>
                 <li><a href="#settings_folder" data-toggle="tab">Folders</a></li>
                 <li><a href="#settings_appearance" data-toggle="tab">Appearance</a></li>
+								<li><a href="#settings_logs" data-toggle="tab">Logs</a></li>
             </ul>
 
             <div class="tab-content span8">
@@ -535,6 +536,52 @@
                 </div>
                 {% endif %}
 
+								<div class="tab-pane" id="settings_logs" data-bind="allowBindings: false">
+									<div id="logs">
+										<h1>Logs</h1>
+
+										<div class="pull-right">
+											<small>
+												Sort by: <a href="#" data-bind="click: function() { listHelper.changeSorting('name'); }">Name (ascending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('creation'); }">Creation date (descending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('size'); }">Size (descending)</a>
+											</small>
+										</div>
+										<table class="table table-striped table-hover table-condensed table-hover" id="log_files">
+											<thead>
+												<tr>
+													<th class="log_files_name">Name</th>
+													<th class="log_files_size">Size</th>
+													<th class="log_files_action">Action</th>
+												</tr>
+											</thead>
+											<tbody data-bind="foreach: listHelper.paginatedItems">
+												<tr data-bind="attr: {title: name}">
+													<td class="log_files_name" data-bind="text: name"></td>
+													<td class="log_files_size" data-bind="text: size"></td>
+													<td class="log_files_action">
+														<a href="#" class="icon-trash" data-bind="click: function() { if ($root.loginState.isUser()) { $parent.removeFile($data.name); } else { return; } }, css: {disabled: !$root.loginState.isUser()}"></a>&nbsp;|&nbsp;<a href="#" class="icon-download" data-bind="attr: {href: url}"></a>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										<div class="pagination pagination-mini pagination-centered">
+											<ul>
+												<li data-bind="css: {disabled: listHelper.currentPage() === 0}">
+													<a href="#" data-bind="click: listHelper.prevPage">«</a>
+												</li>
+											</ul>
+											<ul data-bind="foreach: listHelper.pages">
+												<li data-bind="css: { active: $data.number === $root.listHelper.currentPage(), disabled: $data.number === -1 }">
+													<a href="#" data-bind="text: $data.text, click: function() { $root.listHelper.changePage($data.number); }"></a>
+												</li>
+											</ul>
+											<ul>
+												<li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}">
+													<a href="#" data-bind="click: listHelper.nextPage">»</a>
+												</li>
+											</ul>
+										</div>
+									</div>
+								</div>
             </div>
         </div>
     </div>