diff --git a/src/optionsbars/classic/optionsbar_classic.py b/src/optionsbars/classic/optionsbar_classic.py
index 6604abc8..1658c33b 100644
--- a/src/optionsbars/classic/optionsbar_classic.py
+++ b/src/optionsbars/classic/optionsbar_classic.py
@@ -94,10 +94,6 @@ def _on_size_changed(self, *args):
 	############################################################################
 	# Colors ###################################################################
 
-	def _on_color_changed(self, *args):
-		# TODO connect that to whatever needs it
-		self.window.on_tool_options_changed()
-
 	def middle_click_action(self):
 		left_color = self._color_l.color_widget.get_rgba()
 		self._color_l.color_widget.set_rgba(self._color_r.color_widget.get_rgba())
diff --git a/src/optionsbars/classic/optionsbar_color_popover.py b/src/optionsbars/classic/optionsbar_color_popover.py
index 25e62412..ad0e5a68 100644
--- a/src/optionsbars/classic/optionsbar_color_popover.py
+++ b/src/optionsbars/classic/optionsbar_color_popover.py
@@ -207,6 +207,8 @@ def _on_color_changed(self, *args):
 		op_as_string = self._options_manager.get_value('cairo_operator')
 		self._set_thumbnail_color(op_as_string)
 
+		self._options_manager.window.on_tool_options_changed()
+
 	def _set_thumbnail_color(self, op_as_string):
 		"""Sets the icon and the tooltip of the popover's button. The icon can
 		be an actual icon, or a rectangle of color. The tooltip shows the active
diff --git a/src/tools/transform_tools/tool_filters.py b/src/tools/transform_tools/tool_filters.py
index 9403cdb3..4ea2d8ff 100644
--- a/src/tools/transform_tools/tool_filters.py
+++ b/src/tools/transform_tools/tool_filters.py
@@ -144,7 +144,7 @@ def on_tool_selected(self, *args):
 			operation['radius'] = 0
 			# when the active filter is blurring the image, we cheat a little to
 			# improve performance, but the filtered pixbuf isn't preview until
-			# the user explicitely clicks on the canvas to preview
+			# the user explicitly clicks on the canvas to preview
 			self.do_tool_operation(operation)
 
 	def _async_open_menu(self, *args):
diff --git a/src/window.py b/src/window.py
index 0c35d878..961009a6 100644
--- a/src/window.py
+++ b/src/window.py
@@ -956,6 +956,8 @@ def _build_options_menu(self):
 		pane.build_options_menu(widget, model, label)
 
 	def on_tool_options_changed(self, *args):
+		if self.active_tool_id is None:
+			return
 		self.active_tool().on_options_changed()
 		self.set_window_subtitles()