diff --git a/ChangeLog b/ChangeLog
index 74efa04e..660a1988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 terminator 0.8.1:
 	* Fixed ChangeLog
 	* Revert URI matching behaviour to the same as gnome-terminal
+	* Close LP #179315 with a fuller fix that provides proper colour support
 
 terminator 0.8:
 	* Make dependency on python-gnome optional. Non-gnome users can now reap
diff --git a/terminator b/terminator
index c398063f..0fb130f4 100755
--- a/terminator
+++ b/terminator
@@ -135,7 +135,7 @@ class TerminatorTerm:
     self._box.show ()
 
     self._scrollbar = gtk.VScrollbar (self._vte.get_adjustment ())
-    if self.scrollbar_position != "hidden":
+    if self.scrollbar_position != "hidden" and self.scrollbar_position != "disabled":
       self._scrollbar.show ()
 
     if self.scrollbar_position == 'right':
@@ -305,7 +305,7 @@ class TerminatorTerm:
     scrollbar_position = self.reconf ('scrollbar_position')
 
     if scrollbar_position != self.scrollbar_position:
-      if scrollbar_position == 'hidden':
+      if scrollbar_position == 'hidden' or scrollbar_position == 'disabled':
         self._scrollbar.hide ()
       else:
         self._scrollbar.show ()