Fix weirdnesses with related widgets [story:44874185] [story:45090903]