otherwise we screw up the tool view display on application startup (cherry picked from commit 94c28171)