diff --git a/colorpicker/src/main/java/com/flask/colorpicker/ColorPickerView.java b/colorpicker/src/main/java/com/flask/colorpicker/ColorPickerView.java
index bad746c0c4..bdd798029a 100644
--- a/colorpicker/src/main/java/com/flask/colorpicker/ColorPickerView.java
+++ b/colorpicker/src/main/java/com/flask/colorpicker/ColorPickerView.java
@@ -343,6 +343,17 @@ public class ColorPickerView extends View {
 		return Utils.adjustAlpha(this.alpha, color);
 	}
 
+	public int getEnteredColor() {
+		if (this.colorEdit != null)
+			try {
+				return Color.parseColor(this.colorEdit.getText().toString());
+			} catch (Throwable ex) {
+				return Color.TRANSPARENT;
+			}
+		else
+			return getSelectedColor();
+	}
+
 	public Integer[] getAllColors() {
 		return initialColors;
 	}
diff --git a/colorpicker/src/main/java/com/flask/colorpicker/builder/ColorPickerDialogBuilder.java b/colorpicker/src/main/java/com/flask/colorpicker/builder/ColorPickerDialogBuilder.java
index c724bb74e4..3f51a5dd96 100644
--- a/colorpicker/src/main/java/com/flask/colorpicker/builder/ColorPickerDialogBuilder.java
+++ b/colorpicker/src/main/java/com/flask/colorpicker/builder/ColorPickerDialogBuilder.java
@@ -289,7 +289,7 @@ public class ColorPickerDialogBuilder {
 	}
 
 	private void positiveButtonOnClick(DialogInterface dialog, ColorPickerClickListener onClickListener) {
-		int selectedColor = colorPickerView.getSelectedColor();
+		int selectedColor = colorPickerView.getEnteredColor();
 		Integer[] allColors = colorPickerView.getAllColors();
 		onClickListener.onClick(dialog, selectedColor, allColors);
 	}