improved cluster docu window handling