diff --git a/widgets/helpWidget/helpWidget.cc b/widgets/helpWidget/helpWidget.cc
index 46755c82a533b97acd94755a458099c377a3701f..b5d60a6789838724a124807a4e8e7997257658a8 100644
--- a/widgets/helpWidget/helpWidget.cc
+++ b/widgets/helpWidget/helpWidget.cc
@@ -56,8 +56,8 @@ HelpWidget::HelpWidget(QWidget* parent, const QString& _homeSite, const QString&
 
     homeIndex_ = tabWidget_->addTab(textWindow_, "Home");
 
-    gridLayout_->addWidget(helpEngine_->contentWidget(), 0, 0);
-    gridLayout_->addWidget(tabWidget_, 0, 1);
+    gridLayout_->addWidget(helpEngine_->contentWidget(), 1, 0);
+    gridLayout_->addWidget(tabWidget_, 1, 1);
 
     gridLayout_->setColumnStretch(0, 1);
     gridLayout_->setColumnStretch(1, 3);
@@ -77,10 +77,7 @@ HelpWidget::HelpWidget(QWidget* parent, const QString& _homeSite, const QString&
 
     // Entry in tree view has been clicked
     connect(helpEngine_->contentWidget(), SIGNAL(linkActivated(const QUrl&)),
-            textWindow_, SLOT(open(const QUrl&)));
-
-    connect(helpEngine_->indexWidget(), SIGNAL(linkActivated(const QUrl&, const QString&)),
-            textWindow_, SLOT(open(const QUrl&, const QString&)));
+            this, SLOT(linkActivated(const QUrl&)));
 
 
     // Search button
@@ -108,11 +105,19 @@ HelpWidget::HelpWidget(QWidget* parent, const QString& _homeSite, const QString&
     // Source has been reloaded
     connect(textWindow_, SIGNAL(urlChanged(const QUrl&)), this, SLOT(update(const QUrl&)));
 
+    // Register documentation
+    helpEngine_->registerDocumentation(filename);
 
     // Load main page
     textWindow_->open(QUrl(homeSite_));
 }
 
+void HelpWidget::linkActivated(const QUrl& _url) {
+
+	textWindow_->open(_url);
+	tabWidget_->setCurrentIndex(homeIndex_);
+}
+
 void HelpWidget::startSearch() {
 
 	searchEngine_->search(searchEngine_->queryWidget()->query());
@@ -138,6 +143,8 @@ void HelpWidget::goForward() {
 
 	textWindow_->forward();
 
+	tabWidget_->setCurrentIndex(homeIndex_);
+
 	updateButtons();
 }
 
@@ -145,6 +152,8 @@ void HelpWidget::goBack() {
 
 	textWindow_->backward();
 
+	tabWidget_->setCurrentIndex(homeIndex_);
+
 	updateButtons();
 }
 
@@ -152,6 +161,8 @@ void HelpWidget::goHome() {
 
 	textWindow_->open(homeSite_);
 
+	tabWidget_->setCurrentIndex(homeIndex_);
+
 	updateButtons();
 }
 
diff --git a/widgets/helpWidget/helpWidget.hh b/widgets/helpWidget/helpWidget.hh
index 74a6be087198dc4cee37e25a4a6ebb23c87afac8..25500e415f9dd9f6ca027b36469eca895d7ce375 100644
--- a/widgets/helpWidget/helpWidget.hh
+++ b/widgets/helpWidget/helpWidget.hh
@@ -45,6 +45,8 @@ private slots:
 
 	void showSearchWidget();
 
+	void linkActivated(const QUrl& _url);
+
 	void showFoundSite(const QUrl& _url);
 
 	void showResults(int _hits);