diff --git a/part.cpp b/part.cpp
index bb19ab082..f82f298b5 100644
--- a/part.cpp
+++ b/part.cpp
@@ -1947,6 +1947,14 @@ void Part::slotRebuildBookmarkMenu()
 void Part::enableLayers(bool enable)
 {
     m_sidebar->hideItem( 1, !enable );
+    if( enable)
+    {
+        m_sidebar->setCurrentIndex( 1 );
+    }
+    else if( m_sidebar->currentIndex() == 1 )
+    {
+        m_sidebar->setCurrentIndex( 2 );
+    }
 }
 
 void Part::slotShowFindBar()
diff --git a/ui/layers.cpp b/ui/layers.cpp
index 7e67324c7..0c73d4057 100644
--- a/ui/layers.cpp
+++ b/ui/layers.cpp
@@ -30,8 +30,8 @@ Layers::Layers(QWidget *parent, Okular::Document *document) : QWidget(parent), m
 
     m_searchLine = new KTreeViewSearchLine( this );
     mainlay->addWidget( m_searchLine );
-    m_searchLine->setCaseSensitivity( Okular::Settings::self()->contentsSearchCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive );
-    m_searchLine->setRegularExpression( Okular::Settings::self()->contentsSearchRegularExpression() );
+    m_searchLine->setCaseSensitivity( Okular::Settings::self()->layersSearchCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive );
+    m_searchLine->setRegularExpression( Okular::Settings::self()->layersSearchRegularExpression() );
     connect( m_searchLine, SIGNAL(searchOptionsChanged()), this, SLOT(saveSearchOptions()) );
 
     m_treeView = new QTreeView( this );