diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index b73958a3dbd229e96dbaea9f6591501b0b533bea..aad5f6945461247dca6bf3a44ab4799d279e8974 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -31,7 +31,7 @@
 #include <QMenu>
 #include <QTreeView>
 #include <QVBoxLayout>
-
+#include <QHeaderView>
 #include <boost/polymorphic_cast.hpp>
 
 using boost::polymorphic_downcast;
@@ -62,6 +62,7 @@ FitParameterWidget::FitParameterWidget(QWidget* parent)
     m_treeView->installEventFilter(m_keyboardFilter);
     m_treeView->setAlternatingRowColors(true);
     m_treeView->setStyleSheet("alternate-background-color: #EFF0F1;");
+    m_treeView->header()->setSectionResizeMode(QHeaderView::Stretch);
 
     connect(m_treeView, &QTreeView::customContextMenuRequested, this,
             &FitParameterWidget::onFitParameterTreeContextMenu);
diff --git a/GUI/View/Job/JobPropertiesWidget.cpp b/GUI/View/Job/JobPropertiesWidget.cpp
index 6d6164fe4ba476d80ac20c794336d88957f0e15e..9970a1d4b6dee0f7dbd9ef22ca20cac20e626877 100644
--- a/GUI/View/Job/JobPropertiesWidget.cpp
+++ b/GUI/View/Job/JobPropertiesWidget.cpp
@@ -22,6 +22,7 @@
 #include <QTextEdit>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <QHeaderView>
 
 namespace {
 
@@ -58,6 +59,7 @@ JobPropertiesWidget::JobPropertiesWidget(QWidget* parent, Qt::WindowFlags f)
     m_tabWidget->insertTab(JOB_PROPERTIES, m_propertiesView, "Job Properties");
     m_propertiesModel = new JobPropertiesTableModel(this);
     m_propertiesView->setModel(m_propertiesModel);
+    m_propertiesView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
 
     m_commentsEditor = new QTextEdit(this);
     m_tabWidget->insertTab(JOB_MESSAGES, m_commentsEditor, "Messages");