diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h
index 26d94bff4cc..0713042dc15 100644
--- a/src/plugins/debugger/stackhandler.h
+++ b/src/plugins/debugger/stackhandler.h
@@ -45,7 +45,7 @@ enum StackColumns
     StackFileNameColumn,
     StackLineNumberColumn,
     StackAddressColumn,
-    StackColumnCount = StackAddressColumn,
+    StackColumnCount
 };
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 4c863307c01..cf07816ae5a 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -60,18 +60,21 @@ StackTreeView::StackTreeView()
 {
     setWindowTitle(tr("Stack"));
 
-    connect(action(UseAddressInStackView), SIGNAL(toggled(bool)),
-        SLOT(showAddressColumn(bool)));
-    connect(action(ExpandStack), SIGNAL(triggered()),
-        SLOT(reloadFullStack()));
-    connect(action(MaximalStackDepth), SIGNAL(triggered()),
-        SLOT(reloadFullStack()));
+    connect(action(UseAddressInStackView), &QAction::toggled,
+        this, &StackTreeView::showAddressColumn);
+    connect(action(ExpandStack), &QAction::triggered,
+        this, &StackTreeView::reloadFullStack);
+    connect(action(MaximalStackDepth), &QAction::triggered,
+        this, &StackTreeView::reloadFullStack);
     showAddressColumn(false);
 }
 
 void StackTreeView::showAddressColumn(bool on)
 {
     setColumnHidden(StackAddressColumn, !on);
+    resizeColumnToContents(StackLevelColumn);
+    resizeColumnToContents(StackLineNumberColumn);
+    resizeColumnToContents(StackAddressColumn);
 }
 
 void StackTreeView::rowActivated(const QModelIndex &index)
diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h
index c8f16ee3c45..af637ac3b98 100644
--- a/src/plugins/debugger/stackwindow.h
+++ b/src/plugins/debugger/stackwindow.h
@@ -38,19 +38,16 @@ namespace Internal {
 
 class StackTreeView : public Utils::BaseTreeView
 {
-    Q_OBJECT
-
 public:
     StackTreeView();
 
-private slots:
-    void showAddressColumn(bool on);
-    void reloadFullStack();
-
 private:
     void rowActivated(const QModelIndex &index);
     void setModel(QAbstractItemModel *model);
     void contextMenuEvent(QContextMenuEvent *ev);
+
+    void showAddressColumn(bool on);
+    void reloadFullStack();
     void copyContentsToClipboard();
 };