diff --git a/artpaint/tools/ColorSelectorTool.cpp b/artpaint/tools/ColorSelectorTool.cpp
index 8ce30610..d7774bc1 100644
--- a/artpaint/tools/ColorSelectorTool.cpp
+++ b/artpaint/tools/ColorSelectorTool.cpp
@@ -281,7 +281,10 @@ ColorSelectorTool::ColorSelectorTool()
 	fOptionsCount = 2;
 
 	SetOption(SIZE_OPTION, 1);
-	SetOption(MODE_OPTION, HS_ALL_BUTTONS);
+	SetOption(MODE_OPTION, 0);
+
+	fToolSettings.size = 1;
+	fToolSettings.mode = 0;
 }
 
 
@@ -289,9 +292,14 @@ ToolScript*
 ColorSelectorTool::UseTool(ImageView* view, uint32 buttons, BPoint point, BPoint view_point)
 {
 	BWindow* window = view->Window();
-	BBitmap* bitmap = view->ReturnImage()->ReturnActiveBitmap();
+	BBitmap* bitmap;
 
 	if (window != NULL) {
+		if (fToolSettings.mode == 0)
+			bitmap = view->ReturnImage()->ReturnActiveBitmap();
+		else
+			bitmap = view->ReturnImage()->ReturnRenderedImage();
+
 		BitmapDrawer* drawer = new BitmapDrawer(bitmap);
 
 		BPoint original_point, original_view_point, prev_view_point;
@@ -461,9 +469,24 @@ ColorSelectorToolConfigView::ColorSelectorToolConfigView(DrawingTool* tool)
 
 		fSizeSlider = new NumberSliderControl(B_TRANSLATE("Size:"), "1", message, 1, 10, false);
 
+		BMessage* all_layers_message = new BMessage(OPTION_CHANGED);
+		all_layers_message->AddInt32("option", MODE_OPTION);
+		all_layers_message->AddInt32("value", tool->GetCurrentValue(MODE_OPTION));
+		fAllLayersCheckbox = new BCheckBox(B_TRANSLATE("Sample all layers"), all_layers_message);
+
 		BGridLayout* sizeLayout = LayoutSliderGrid(fSizeSlider);
-		layout->AddView(sizeLayout->View());
+
+		layout->AddView(BGroupLayoutBuilder(B_VERTICAL, kWidgetSpacing)
+			.Add(sizeLayout)
+			.Add(fAllLayersCheckbox)
+			.TopView()
+		);
 	}
+
+	if (tool->GetCurrentValue(MODE_OPTION) == 1)
+		fAllLayersCheckbox->SetValue(B_CONTROL_ON);
+	else
+		fAllLayersCheckbox->SetValue(B_CONTROL_OFF);
 }
 
 
@@ -473,4 +496,5 @@ ColorSelectorToolConfigView::AttachedToWindow()
 	DrawingToolConfigView::AttachedToWindow();
 
 	fSizeSlider->SetTarget(this);
+	fAllLayersCheckbox->SetTarget(this);
 }
diff --git a/artpaint/tools/ColorSelectorTool.h b/artpaint/tools/ColorSelectorTool.h
index 1edd3a4e..4ce71582 100644
--- a/artpaint/tools/ColorSelectorTool.h
+++ b/artpaint/tools/ColorSelectorTool.h
@@ -14,6 +14,9 @@
 #include "DrawingTool.h"
 
 
+#include "CheckBox.h"
+
+
 class ImageView;
 
 
@@ -45,6 +48,7 @@ class ColorSelectorToolConfigView : public DrawingToolConfigView {
 
 private:
 			NumberSliderControl* fSizeSlider;
+			BCheckBox* 			 fAllLayersCheckbox;
 };