diff --git a/app/guid-node/links/template.hbs b/app/guid-node/links/template.hbs
index e5ad5fce2d..f23d990483 100644
--- a/app/guid-node/links/template.hbs
+++ b/app/guid-node/links/template.hbs
@@ -41,7 +41,7 @@
     {{else}}
         <p>{{t 'links.empty-screen-message'}}</p>
         {{#if this.currentUserCanEdit}}
-            <p> {{t 'links.point-to-addons-message'}} <a href='/{{this.model.node.id}}/addons?activeFilterType=verified-link'>{{t 'addons.heading'}}</a></p>
+            <p> {{t 'links.point-to-addons-message-1'}} <a href='/{{this.model.node.id}}/addons?activeFilterType=verified-link'>{{t 'addons.heading'}}</a>{{t 'links.point-to-addons-message-2'}}</p>
         {{/if}}
     {{/if}}
 </div>
diff --git a/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss b/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss
index 83a44de0e6..821c822865 100644
--- a/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss
+++ b/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss
@@ -68,3 +68,7 @@
     white-space: pre-wrap;
 
 }
+
+.trigger {
+    width: 130px;
+}
diff --git a/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs b/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs
index bb1827dfc0..1aed8f1fd3 100644
--- a/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs
+++ b/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs
@@ -167,25 +167,29 @@
         ></GoogleFilePickerWidget>
     {{/if}}
     {{#if this.isLinkAddon}}
-        <label>
-            {{t 'addons.configure.resource-type'}}
-            <Button
-                aria-label={{t 'addons.configure.resource-type-helper-aria-label'}}
-                @layout='fake-link'
-                {{on 'click' (fn (mut this.isResourceTypeDialogOpen) true)}}
-            >
-                <FaIcon @icon='question-circle' />
-            </Button>
+        {{#let (unique-id 'resource-type') as |resourceTypeId|}}
+            <label for={{resourceTypeId}}>
+                {{t 'addons.configure.resource-type'}}
+                <Button
+                    aria-label={{t 'addons.configure.resource-type-helper-aria-label'}}
+                    @layout='fake-link'
+                    {{on 'click' (fn (mut this.isResourceTypeDialogOpen) true)}}
+                >
+                    <FaIcon @icon='question-circle' />
+                </Button>
+            </label>
             <PowerSelect
+                id={{resourceTypeId}}
                 @options={{@supportedResourceTypes}}
                 @selected={{this.selectedResourceType}}
                 @onChange={{action (mut this.selectedResourceType)}}
+                @triggerClass={{local-class 'trigger'}}
                 @placeholder={{t 'addons.configure.resource-type-placeholder'}}
                 as |resourceType|
             >
                 {{resourceType}}
             </PowerSelect>
-        </label>
+        {{/let}}
     {{/if}}
     <div local-class='footer-buttons-wrapper'>
         <Button
diff --git a/translations/en-us.yml b/translations/en-us.yml
index d8d4fab667..c3ad0073d9 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -400,7 +400,8 @@ links:
     display-name: 'Display Name'
     resource-type: 'Resource Type'
     empty-screen-message: 'This project has no configured linked services at the moment '
-    point-to-addons-message: 'In order to add linked service visit'
+    point-to-addons-message-1: 'Visit '
+    point-to-addons-message-2: ' to add a linked service.'
     link: 'Link'
     edit: 'Edit'
     icon: '{addonName} icon'