diff --git a/infocenter.cpp b/infocenter.cpp
index d7ee270..125e952 100644
--- a/infocenter.cpp
+++ b/infocenter.cpp
@@ -1,243 +1,245 @@
 
 /*
  *  infocenter.cpp
  *
  *  Copyright (C) 2010 David Hubner <hubnerd@ntlworld.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 //Local
 #include "infocenter.h"
 
 //KDE
 #include <KLocalizedString>
 #include <QIcon>
 #include <KConfig>
 #include <KToolInvocation>
 #include <KActionMenu>
 #include <kxmlguifactory.h>
 #include <KStandardAction>
 #include <KActionCollection>
 #include <KAboutApplicationDialog>
 #include <KMessageBox>
 #include <KToolBar>
 
 //QT
 #include <QUrl>
 #include <QProcess>
 #include <QTextStream>
 #include <QFile>
 #include <QKeySequence>
 #include <QFileDialog>
 #include <QHBoxLayout>
 #include <QMenuBar>
 
 KInfoCenter::KInfoCenter() : KXmlGuiWindow( 0, Qt::WindowContextHelpButtonHint )
 {
     setWindowIcon(QIcon::fromTheme(QStringLiteral("hwinfo")));
     setWindowTitle(i18nc("Main window title", "KInfocenter"));
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     m_cWidget = new QWidget(this);
     setCentralWidget(m_cWidget);
 
     QVBoxLayout *cLayout = new QVBoxLayout(m_cWidget);
     Q_UNUSED(cLayout);
 
     cLayout->setSpacing(0);
     cLayout->setContentsMargins(0, 0, 0, 0);
     createMainFrame();
     createToolBar();
 
     //TreeWidget
     connect(m_sideMenu,SIGNAL(clicked(const KcmTreeItem*)),this,SLOT(itemClickedSlot(const KcmTreeItem*)));
 
     //SearchBox
     connect(m_searchText, &QLineEdit::textChanged, m_sideMenu, &SidePanel::filterSideMenuSlot);
     connect(m_searchAction, SIGNAL(triggered()),m_searchText,SLOT(setFocus()));
 
     //Buttons
     connect(m_moduleHelpAction, &QAction::triggered,this,&KInfoCenter::helpClickedSlot);
 
     //Menu
     connect(m_aboutKcm, &QAction::triggered, this, &KInfoCenter::aboutKcmSlot);
 
     //Startup
     m_searchText->completionObject()->setItems(m_sideMenu->allChildKeywords());
     m_sideMenu->setFocus(Qt::OtherFocusReason);
     m_sideMenu->changeToFirstValidItem();
 
     m_toolTips = new ToolTipManager(m_sideMenu);
     setupGUI(QSize(640,480), ToolBar | Keys | Save | Create, QStringLiteral("kinfocenterui.rc"));
 
     m_helpAction->setMenu( dynamic_cast<QMenu*>( factory()->container(QStringLiteral("help"), this) ) );
     menuBar()->hide();
 
     QAction *aboutApp = actionCollection()->action(QStringLiteral("help_about_app"));
     aboutApp->setIcon(QIcon::fromTheme(QStringLiteral("hwinfo")));
 }
 
 KInfoCenter::~KInfoCenter()
 {
     delete m_toolTips;
 
     //TreeWidget
     disconnect(m_sideMenu,SIGNAL(clicked(const KcmTreeItem*)),this,SLOT(itemClickedSlot(const KcmTreeItem*)));
 
     //SearchBox
     disconnect(m_searchText, &QLineEdit::textChanged, m_sideMenu, &SidePanel::filterSideMenuSlot);
     disconnect(m_searchAction, SIGNAL(triggered()),m_searchText, SLOT(setFocus()));
 
     //Buttons
     disconnect(m_moduleHelpAction, &QAction::triggered,this,&KInfoCenter::helpClickedSlot);
 
     //Menu
     disconnect(m_aboutKcm, &QAction::triggered, this, &KInfoCenter::aboutKcmSlot);
 }
 
 bool KInfoCenter::eventFilter(QObject *watched, QEvent *event)
 {
     if (watched == m_sideMenu && event->type() == QEvent::Move) {
         m_contain->setKcmTopEdge(m_sideMenu->y());
     }
     return false;
 }
 
 void KInfoCenter::createToolBar()
 {
     KStandardAction::quit(this, SLOT(close()), actionCollection());
     KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
 
     toolBar()->setMovable(false);
 
     m_aboutKcm = actionCollection()->addAction(QStringLiteral("help_about_module"));
     m_aboutKcm->setText(i18nc("Information about current module located in about menu","About Current Information Module"));
     m_aboutKcm->setIcon(QIcon::fromTheme(QStringLiteral("help-about")));
     m_aboutKcm->setEnabled(false);
 
     m_moduleHelpAction = new QAction(this);
     m_moduleHelpAction->setText(i18nc("Module help button label", "Module Help"));
     m_moduleHelpAction->setIcon(QIcon::fromTheme(QStringLiteral("help-contextual")));
 
     m_helpAction = new KActionMenu( QIcon::fromTheme(QStringLiteral("help-contents")), i18nc("Help button label","Help"), this );
     m_helpAction->setDelayed( false );
 
     actionCollection()->addAction(QStringLiteral("helpModule"), m_moduleHelpAction);
     actionCollection()->addAction(QStringLiteral("helpMenu"), m_helpAction);
 }
 
 void KInfoCenter::createMainFrame()
 {
     QWidget *mainDisplay = new QWidget();
     mainDisplay->setContentsMargins(0,0,0,0);
 
     QHBoxLayout *mainLayout = new QHBoxLayout(mainDisplay);
 
     m_splitter = new QSplitter(m_cWidget);
     m_splitter->setContentsMargins(0, 0, 0, 0);
     m_splitter->setHandleWidth(5);
     mainLayout->addWidget(m_splitter);
 
     createMenuFrame();
 
     m_contain = new KcmContainer(m_splitter);
     m_splitter->addWidget(m_contain);
 
     m_splitter->setStretchFactor(0, 0);
     m_splitter->setStretchFactor(1, 1);
 
     m_cWidget->layout()->addWidget(mainDisplay);
 }
 
 void KInfoCenter::createMenuFrame()
 {
     QWidget *sideFrame = new QWidget(m_splitter);
     sideFrame->setContentsMargins(0,0,0,0);
 
     QVBoxLayout *menuLayout = new QVBoxLayout(sideFrame);
     menuLayout->setContentsMargins(0, 0, 0, 0);
 
     m_searchText = new KLineEdit(sideFrame);
     m_searchText->setClearButtonEnabled(true);
     m_searchText->setPlaceholderText( i18nc( "Search Bar Click Message", "Search" ) );
     m_searchText->setCompletionMode( KCompletion::CompletionPopup );
     m_searchText->completionObject()->setIgnoreCase(true);
 
     m_searchAction = new QAction(this);
     m_searchAction->setText(i18nc("Kaction search label", "Search Modules"));
     m_searchAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
 
     actionCollection()->addAction(QStringLiteral("search"),m_searchAction);
     actionCollection()->setDefaultShortcut(m_searchAction, QKeySequence(Qt::CTRL + Qt::Key_F));
 
     m_sideMenu = new SidePanel(sideFrame);
     m_sideMenu->installEventFilter(this);
 
     menuLayout->addWidget(m_searchText);
     menuLayout->addWidget(m_sideMenu);
     m_splitter->addWidget(sideFrame);
 }
 
 void KInfoCenter::itemClickedSlot(const KcmTreeItem *item)
 {
 	resetCondition();
 	if(item->type() != KcmTreeItem::CATEGORY) {
         setKcm(item);
     }
 }
 
 void KInfoCenter::setKcm(const KcmTreeItem *kcmItem)
 {
-    m_contain->setKcm(kcmItem->kcm());
+    if (m_contain->fileName() != kcmItem->kcm().fileName()) {
+        m_contain->setKcm(kcmItem->kcm());
 
-    setButtons(m_contain->buttons());
-    m_aboutKcm->setEnabled(true);
+        setButtons(m_contain->buttons());
+        m_aboutKcm->setEnabled(true);
+    }
 }
 
 void KInfoCenter::setButtons(const KCModule::Buttons buttons)
 {
     if (buttons & KCModule::Help) {
         m_moduleHelpAction->setEnabled(true);
     }
 }
 
 void KInfoCenter::resetCondition()
 {
     m_moduleHelpAction->setEnabled(false);
 
     m_aboutKcm->setEnabled(false);
 }
 
 void KInfoCenter::helpClickedSlot()
 {
     // Nicked from Ben, could not use KToolInvocation due to docpath.
     QString docPath = m_contain->helpPath();
 
     QUrl url("help:/" + docPath );
     QProcess::startDetached(QStringLiteral("khelpcenter"), QStringList() << url.url());
 }
 
 void KInfoCenter::aboutKcmSlot()
 {
     KAboutApplicationDialog kcmAboutDialog(*(m_contain->kcmAboutData()));
     kcmAboutDialog.exec();
 }
 
 void KInfoCenter::showError(QWidget *parent, const QString& errorMessage)
 {
     KMessageBox::sorry(parent, errorMessage);
 }
diff --git a/sidepanel.cpp b/sidepanel.cpp
index d3b4bbc..a3a4510 100644
--- a/sidepanel.cpp
+++ b/sidepanel.cpp
@@ -1,142 +1,144 @@
 
 /*
  *  sidepanel.cpp
  *
  *  Copyright (C) 2010 David Hubner <hubnerd@ntlworld.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 //Local
 #include "sidepanel.h"
 
 //KDE
 #include <KLocalizedString>
 
 //QT
 #include <QWidget>
 #include <QRegExp>
 #include <QMenu>
 
 SidePanel::SidePanel(QWidget *parent) : QTreeView(parent)
 {
     setHeaderHidden(true);
     setSortingEnabled(true);
     setAnimated(true);
     sortByColumn(0, Qt::AscendingOrder);
     m_model = new InfoKcmModel(this);
 
     m_proxyModel = new InfoKcmProxyModel(this);
     m_proxyModel->setSourceModel(m_model);
 
     createMenuActions();
 
     setMouseTracking(true);
     setModel(m_proxyModel);
+    connect(this,SIGNAL(activated(QModelIndex)),this,SLOT(clickedSlot(QModelIndex)));
     connect(this,SIGNAL(clicked(QModelIndex)),this,SLOT(clickedSlot(QModelIndex)));
 }
 
 SidePanel::~SidePanel()
 {
+    disconnect(this,SIGNAL(activated(QModelIndex)),this,SLOT(clickedSlot(QModelIndex)));
     disconnect(this,SIGNAL(clicked(QModelIndex)),this,SLOT(clickedSlot(QModelIndex)));
 
     delete m_proxyModel;
     delete m_model;
 }
 
 void SidePanel::clickedSlot(const QModelIndex &index)
 {
     if(index.isValid() == false) {
         return;
     }
 
     const KcmTreeItem *item = static_cast<KcmTreeItem*>(m_proxyModel->mapToSource(index).internalPointer());
     emit clicked(item);
 }
 
 void SidePanel::changeToFirstValidItem()
 {
     QModelIndex rootIndex = m_proxyModel->mapFromSource(m_model->firstValid());
     if(rootIndex.isValid() == false) {
         return;
     }
 
     setCurrentIndex(rootIndex);
     emit clickedSlot(rootIndex);
 }
 
 QModelIndex SidePanel::mapToProxySource(const QModelIndex& index)
 {
     QModelIndex tmp = m_proxyModel->mapToSource(index);
 
     if(tmp.isValid() == true) {
         return tmp;
     }
     return QModelIndex();
 }
 
 void SidePanel::filterSideMenuSlot(const QString &pattern)
 {
     if(pattern.isEmpty()) {
         collapseAll();
     } else {
         expandAll();
     }
     m_proxyModel->setFilterRegExp(QRegExp(pattern,Qt::CaseInsensitive));
 }
 
 void SidePanel::createMenuActions()
 {
     resetAct = new QAction(i18n("Clear Search"), this);
     connect(resetAct, &QAction::triggered, this, &SidePanel::resetSearchSlot);
 
     expAct = new QAction(i18n("Expand All Categories"), this);
     connect(expAct, &QAction::triggered, this, &SidePanel::expandAllSlot);
 
     colAct = new QAction(i18n("Collapse All Categories"), this);
     connect(colAct, &QAction::triggered, this, &SidePanel::collapseAllSlot);
 }
 
 void SidePanel::contextMenuEvent(QContextMenuEvent *event)
 {
     QMenu menu(this);
 
     menu.addAction(colAct);
     menu.addAction(expAct);
     menu.addAction(resetAct);
     menu.exec(event->globalPos());
 }
 
 void SidePanel::collapseAllSlot()
 {
     collapseAll();
 }
 
 void SidePanel::expandAllSlot()
 {
     expandAll();
 }
 
 QStringList SidePanel::allChildKeywords()
 {
     return m_model->allChildrenKeywords();
 }
 
 void SidePanel::resetSearchSlot()
 {
     filterSideMenuSlot(QLatin1String(""));
 }