diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 32ef0988df2..5577f05b850 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -85,35 +85,33 @@ NavigationWidgetPlaceHolder::~NavigationWidgetPlaceHolder()
     }
 }
 
-void NavigationWidgetPlaceHolder::applyStoredSize(int width)
+void NavigationWidgetPlaceHolder::applyStoredSize()
 {
-    if (width) {
-        QSplitter *splitter = qobject_cast<QSplitter *>(parentWidget());
-        if (splitter) {
-            // A splitter we need to resize the splitter sizes
-            QList<int> sizes = splitter->sizes();
-            int index = splitter->indexOf(this);
-            int diff = width - sizes.at(index);
-
-            int count = sizes.count();
-            for (int i = 0; i < sizes.count(); ++i) {
-                if (qobject_cast<NavigationWidgetPlaceHolder *>(splitter->widget(i)))
-                    --count;
+    QSplitter *splitter = qobject_cast<QSplitter *>(parentWidget());
+    if (splitter) {
+        // A splitter we need to resize the splitter sizes
+        QList<int> sizes = splitter->sizes();
+        int diff = 0;
+        int count = sizes.count();
+        for (int i = 0; i < sizes.count(); ++i) {
+            if (auto ph = qobject_cast<NavigationWidgetPlaceHolder *>(splitter->widget(i))) {
+                --count;
+                int width = ph->storedWidth();
+                diff += width - sizes.at(i);
+                sizes[i] = width;
             }
-
-            int adjust = count > 1 ? (diff / (count - 1)) : 0;
-            for (int i = 0; i < sizes.count(); ++i) {
-                if (!qobject_cast<NavigationWidgetPlaceHolder *>(splitter->widget(i)))
-                    sizes[i] += adjust;
-            }
-
-            sizes[index] = width;
-            splitter->setSizes(sizes);
-        } else {
-            QSize s = size();
-            s.setWidth(width);
-            resize(s);
         }
+        int adjust = count > 1 ? (diff / (count - 1)) : 0;
+        for (int i = 0; i < sizes.count(); ++i) {
+            if (!qobject_cast<NavigationWidgetPlaceHolder *>(splitter->widget(i)))
+                sizes[i] += adjust;
+        }
+
+        splitter->setSizes(sizes);
+    } else {
+        QSize s = size();
+        s.setWidth(storedWidth());
+        resize(s);
     }
 }
 
@@ -138,17 +136,20 @@ void NavigationWidgetPlaceHolder::currentModeAboutToChange(Id mode)
     if (m_mode == mode) {
         setCurrent(m_side, this);
 
-        int width = navigationWidget->storedWidth();
-
         layout()->addWidget(navigationWidget);
         navigationWidget->show();
 
-        applyStoredSize(width);
+        applyStoredSize();
         setVisible(navigationWidget->isShown());
         navigationWidget->placeHolderChanged(this);
     }
 }
 
+int NavigationWidgetPlaceHolder::storedWidth() const
+{
+    return NavigationWidget::instance(m_side)->storedWidth();
+}
+
 struct ActivationInfo {
     Side side;
     int position;
@@ -474,7 +475,7 @@ void NavigationWidget::restoreSettings(QSettings *settings)
 
     // Apply
     if (NavigationWidgetPlaceHolder::current(d->m_side))
-        NavigationWidgetPlaceHolder::current(d->m_side)->applyStoredSize(d->m_width);
+        NavigationWidgetPlaceHolder::current(d->m_side)->applyStoredSize();
 
     // Restore last activation positions
     settings->beginGroup(settingsGroup());
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index 08d2e29f91b..4de2d8d95c8 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -58,10 +58,11 @@ public:
     virtual ~NavigationWidgetPlaceHolder();
     static NavigationWidgetPlaceHolder *current(Side side);
     static void setCurrent(Side side, NavigationWidgetPlaceHolder *navWidget);
-    void applyStoredSize(int width);
+    void applyStoredSize();
 
 private:
     void currentModeAboutToChange(Id mode);
+    int storedWidth() const;
 
     Id m_mode;
     Side m_side;