diff --git a/app/src/main/java/com/czlucius/scan/ui/CreateFragment.java b/app/src/main/java/com/czlucius/scan/ui/CreateFragment.java
index 65f3365..73c565e 100644
--- a/app/src/main/java/com/czlucius/scan/ui/CreateFragment.java
+++ b/app/src/main/java/com/czlucius/scan/ui/CreateFragment.java
@@ -279,13 +279,19 @@ private void displayContentsDialog() {
 
     private void displayForegroundDialog() {
         displayColorPicker(vm.getForegroundColor(),
-                (color, hexVal) -> vm.setForegroundColor(color));
+                (color, hexVal) -> {
+                    vm.setForegroundColor(color);
+                    vm.setCurrentState(NONE);
+        });
     }
 
 
     private void displayBackgroundDialog() {
         displayColorPicker(vm.getBackgroundColor(),
-                (color, hexVal) -> vm.setBackgroundColor(color));
+                (color, hexVal) -> {
+                    vm.setBackgroundColor(color);
+                    vm.setCurrentState(NONE);
+        });
     }