Sidebar issue fix