diff --git a/kdevplatform/documentation/documentationview.cpp b/kdevplatform/documentation/documentationview.cpp
--- a/kdevplatform/documentation/documentationview.cpp
+++ b/kdevplatform/documentation/documentationview.cpp
@@ -44,11 +44,6 @@
 DocumentationView::DocumentationView(QWidget* parent, ProvidersModel* model)
     : QWidget(parent), mProvidersModel(model)
 {
-    if (ICore::self()->shuttingDown()) {
-        qCWarning(DOCUMENTATION) << "DocumentationView created during shutdown; ignoring";
-        return;
-    }
-
     setWindowIcon(QIcon::fromTheme(QStringLiteral("documentation"), windowIcon()));
     setWindowTitle(i18n("Documentation"));
 
@@ -285,9 +280,7 @@
     if (mCurrent != mHistory.end()) {
         w = (*mCurrent)->documentationWidget(mFindDoc, this);
         Q_ASSERT(w);
-        if (mIdentifiers->window() == w->window()) {
-            QWidget::setTabOrder(mIdentifiers, w);
-        }
+        QWidget::setTabOrder(mIdentifiers, w);
     } else {
         // placeholder widget at location of doc view
         w = new QWidget(this);