Added fix for #538 Components don't "hold their place" in the menu