diff --git a/src/shell-generic-container.c b/src/shell-generic-container.c
index e7f874d83..ad34fee47 100644
--- a/src/shell-generic-container.c
+++ b/src/shell-generic-container.c
@@ -287,6 +287,8 @@ shell_generic_container_remove_actor (ClutterContainer *container,
 {
   ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (container)->priv;
 
+  g_hash_table_remove (priv->skip_paint, actor);
+
   _st_container_remove_actor (container, actor, &priv->children);
 }