diff --git a/src/libide/foundry/ide-config.c b/src/libide/foundry/ide-config.c
index 1252fbbfaaf4b4cccff76ab2e9105bd5dfbcab72..f620e6d844fee63dcc097ac4c769437f8dd983bb 100644
--- a/src/libide/foundry/ide-config.c
+++ b/src/libide/foundry/ide-config.c
@@ -323,6 +323,7 @@ ide_config_finalize (GObject *object)
   g_clear_pointer (&priv->id, g_free);
   g_clear_pointer (&priv->post_install_commands, g_strfreev);
   g_clear_pointer (&priv->prefix, g_free);
+  g_clear_pointer (&priv->run_opts, g_free);
   g_clear_pointer (&priv->runtime_id, g_free);
   g_clear_pointer (&priv->app_id, g_free);
   g_clear_pointer (&priv->toolchain_id, g_free);
@@ -1692,6 +1693,7 @@ ide_config_set_run_opts (IdeConfig   *self,
       g_free (priv->run_opts);
       priv->run_opts = g_strdup (run_opts);
       g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_RUN_OPTS]);
+      ide_config_set_dirty (self, TRUE);
     }
 }
 
diff --git a/src/plugins/buildui/gbp-buildui-config-view-addin.c b/src/plugins/buildui/gbp-buildui-config-view-addin.c
index 63d6f0fb815616d7486f6aa926e21fe97f6de180..dc32ccbf217dfad7f10ddad12f76a56d1c851e72 100644
--- a/src/plugins/buildui/gbp-buildui-config-view-addin.c
+++ b/src/plugins/buildui/gbp-buildui-config-view-addin.c
@@ -475,6 +475,15 @@ gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
                                treat_null_as_empty, NULL, NULL, NULL);
   add_description_row (preferences, "general", "general", _("Configure Options"), NULL, entry);
 
+  entry = g_object_new (GTK_TYPE_ENTRY,
+                        "visible", TRUE,
+                        "hexpand", TRUE,
+                        NULL);
+  g_object_bind_property_full (config, "run-opts", entry, "text",
+                               G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL,
+                               treat_null_as_empty, NULL, NULL, NULL);
+  add_description_row (preferences, "general", "general", _("Run Options"), NULL, entry);
+
   dzl_preferences_add_custom (preferences, "general", "buttons", box, NULL, 5);
 
   /* Setup runtime selection */