diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 492ed1e..16b7f74 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -208,12 +208,19 @@ function AppearanceViewModel(settingsViewModel) {
     self.name = settingsViewModel.appearance_name;
     self.color = settingsViewModel.appearance_color;
 
-    self.title = ko.computed(function() {
+    self.brand = ko.computed(function() {
         if (self.name())
             return "OctoPrint: " + self.name();
         else
             return "OctoPrint";
     })
+
+    self.title = ko.computed(function() {
+        if (self.name())
+            return self.name() + " [OctoPrint]";
+        else
+            return "OctoPrint";
+    })
 }
 
 
diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index 0eb142a..1d93c54 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -26,7 +26,7 @@
         <div id="navbar" class="navbar navbar-fixed-top">
             <div class="navbar-inner" data-bind="css: color">
                 <div class="container">
-                    <a class="brand" href="#"><img src="{{ url_for('static', filename='img/tentacle-20x20.png') }}"> <span data-bind="text: title">OctoPrint</span></a>
+                    <a class="brand" href="#"><img src="{{ url_for('static', filename='img/tentacle-20x20.png') }}"> <span data-bind="text: brand">OctoPrint</span></a>
                     <div class="nav-collapse">
                         <ul class="nav pull-right">
                             <li><a id="navbar_show_settings" class="pull-right" href="#settings_dialog"><i class="icon-wrench"></i> Settings</a></li>