diff --git a/client/galaxy/scripts/mvc/ui/ui-select-content.js b/client/galaxy/scripts/mvc/ui/ui-select-content.js
index ac3bddc5a27..ef9dfc0afc1 100644
--- a/client/galaxy/scripts/mvc/ui/ui-select-content.js
+++ b/client/galaxy/scripts/mvc/ui/ui-select-content.js
@@ -393,7 +393,7 @@ const View = Backbone.View.extend({
             .addClass("d-flex flex-row flex-wrap flex-lg-nowrap")
             .append($("<div/>").append(this.button_type.$el))
             .append($fields);
-        if (galaxy.config.enable_upload_from_form_button) {
+        if (galaxy.config.upload_from_form_button == "always-on") {
             this.$el.append($("<div style='margin-right: 5px;' />").append(this.upload_dialog.$el));
         }
         this.$el.append($("<div/>").append(this.button_dialog.$el));
diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py
index 8755e73ac68..23fe6690e8e 100644
--- a/lib/galaxy/managers/configuration.py
+++ b/lib/galaxy/managers/configuration.py
@@ -105,7 +105,7 @@ class ConfigSerializer(base.ModelSerializer):
             'python'                            : _defaults_to((sys.version_info.major, sys.version_info.minor)),
             'select_type_workflow_threshold'    : _use_config,
             'file_sources_configured'           : lambda config, key, **context: self.app.file_sources.custom_sources_configured,
-            'enable_upload_from_form_button'    : _use_config,
+            'upload_from_form_button'           : _use_config,
         }
 
 
diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml
index 96bfea9a282..06a03fb0325 100644
--- a/lib/galaxy/webapps/galaxy/config_schema.yml
+++ b/lib/galaxy/webapps/galaxy/config_schema.yml
@@ -2158,15 +2158,18 @@ mapping:
           When using LDAP for authentication, allow administrators to pre-populate users
           using an additional form on 'Create new user'
 
-      enable_upload_from_form_button:
-        type: bool
-        default: false
+      upload_from_form_button:
+        type: str
+        default: 'always-off'
         required: false
+        enum: ['always-on', 'always-off']
         desc: |
-          If enabled, add another button to tool form data inputs that allow uploading
+          If 'always-on', add another button to tool form data inputs that allow uploading
           data from the tool form in fewer clicks (at the expense of making the form more
-          complicated).
+          complicated). This applies to workflows as well.
 
+          Avoiding making this a boolean because we may add options such as 'in-single-form-view'
+          or 'in-simplified-workflow-views'. https://github.com/galaxyproject/galaxy/pull/9809/files#r461889109
       allow_user_dataset_purge:
         type: bool
         default: true