diff --git a/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp b/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp
index faf11e8b7..2810113a1 100644
--- a/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp
+++ b/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp
@@ -39,6 +39,11 @@ NodeParamViewConnectedLabel::NodeParamViewConnectedLabel(const NodeInput &input,
   QVBoxLayout *layout = new QVBoxLayout(this);
   layout->setMargin(0);
 
+  QSizePolicy p = sizePolicy();
+  p.setHorizontalStretch(1);
+  p.setHorizontalPolicy(QSizePolicy::Expanding);
+  setSizePolicy(p);
+
   // Set up label area
   QHBoxLayout *label_layout = new QHBoxLayout();
   label_layout->setSpacing(QtUtils::QFontMetricsWidth(fontMetrics(), QStringLiteral(" ")));
diff --git a/app/widget/nodeparamview/nodeparamviewitem.cpp b/app/widget/nodeparamview/nodeparamviewitem.cpp
index fa3c6cd93..c1826fbd6 100644
--- a/app/widget/nodeparamview/nodeparamviewitem.cpp
+++ b/app/widget/nodeparamview/nodeparamviewitem.cpp
@@ -345,7 +345,7 @@ void NodeParamViewItemBody::CreateWidgets(QGridLayout* layout, Node *node, const
     // Create clickable label used when an input is connected
     ui_objects.connected_label = new NodeParamViewConnectedLabel(input_ref);
     connect(ui_objects.connected_label, &NodeParamViewConnectedLabel::RequestSelectNode, this, &NodeParamViewItemBody::RequestSelectNode);
-    layout->addWidget(ui_objects.connected_label, row, kWidgetStartColumn);
+    layout->addWidget(ui_objects.connected_label, row, kWidgetStartColumn, 1, kKeyControlColumn - kWidgetStartColumn);
   }
 
   // Add keyframe control to this layout if parameter is keyframable
@@ -445,6 +445,10 @@ void NodeParamViewItemBody::UpdateUIForEdgeConnection(const NodeInput& input)
 
     // Show/hide connection label
     ui_objects.connected_label->setVisible(input.IsConnected());
+
+    if (ui_objects.key_control) {
+      ui_objects.key_control->setVisible(!input.IsConnected());
+    }
   }
 }
 
diff --git a/app/widget/nodevaluetree/nodevaluetree.cpp b/app/widget/nodevaluetree/nodevaluetree.cpp
index 74c18d4c0..689330237 100644
--- a/app/widget/nodevaluetree/nodevaluetree.cpp
+++ b/app/widget/nodevaluetree/nodevaluetree.cpp
@@ -13,7 +13,10 @@ NodeValueTree::NodeValueTree(QWidget *parent) :
 {
   setColumnWidth(0, 0);
   setColumnCount(4);
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+  QSizePolicy p = sizePolicy();
+  p.setHorizontalStretch(1);
+  setSizePolicy(p);
 
   static const int kMinimumRows = 10;
   setMinimumHeight(fontMetrics().height() * kMinimumRows);