diff --git a/src/views/PortView.cpp b/src/views/PortView.cpp
index 6bdba8d..f1e68b4 100644
--- a/src/views/PortView.cpp
+++ b/src/views/PortView.cpp
@@ -77,6 +77,8 @@ void PortView::Draw()
             ImGui::PopStyleVar();
         }
 
+        _builder->EndInput();
+
         if (ImGui::IsItemActive() && !_was_active)
         {
             ed::EnableShortcuts(false);
@@ -87,8 +89,6 @@ void PortView::Draw()
             ed::EnableShortcuts(true);
             _was_active = false;
         }
-
-        _builder->EndInput();
     }
     else if (Kind == PortType::Output)
     {
diff --git a/src/widgets/InputField.cpp b/src/widgets/InputField.cpp
index 97dc901..e541841 100644
--- a/src/widgets/InputField.cpp
+++ b/src/widgets/InputField.cpp
@@ -6,7 +6,8 @@
 FLOW_UI_SUBNAMESPACE_START(widgets)
 
 template<typename T>
-Input<T>::Input(std::string name, const T& initial_value) : _name{std::move(name)}, _value{initial_value}
+Input<T>::Input(std::string name, const T& initial_value)
+    : _name{std::move(name)}, _value{initial_value}, _data{MakeNodeData<T>(_value)}
 {
 }