am 21a170b2: Fix for stuck widget (issue 6557954)

* commit '21a170b2e17621583f2800d5611459a0a939f560':
  Fix for stuck widget (issue 6557954)