diff --git a/ui/sidebar.cpp b/ui/sidebar.cpp
index f6d1a5fe3..ac90b46ec 100644
--- a/ui/sidebar.cpp
+++ b/ui/sidebar.cpp
@@ -550,7 +550,7 @@ void Sidebar::setItemEnabled( int index, bool enabled )
     }
     d->pages.at( index )->setFlags( f );
 
-    if ( !enabled && index == currentIndex() )
+    if ( !enabled && index == currentIndex() && isSidebarVisible() )
         // find an enabled item, and select that one
         for ( int i = 0; i < d->pages.count(); ++i )
             if ( d->pages.at(i)->flags() & Qt::ItemIsEnabled )
@@ -629,6 +629,7 @@ void Sidebar::itemClicked( QListWidgetItem *item )
         else
         {
             d->sideContainer->show();
+            d->list->show();
         }
     }
     else