#258 keep expand widget with the rest of the layout