Fix click action when multiple widgets are added