diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 3d5ad28fa2..14076ad65e 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -2782,7 +2782,9 @@ static void toolbar( void )
                 }
                 inv_cursor(true);
                 break;
-
+            case ROCKPAINT_QUIT:
+                if (state != State0)
+                    break;
             case ROCKPAINT_TOOLBAR:
             case ROCKPAINT_TOOLBAR2:
                 return;