diff --git a/lib/templates/url_select.mustache b/lib/templates/url_select.mustache
index b2ace98c24c..09048960ba9 100644
--- a/lib/templates/url_select.mustache
+++ b/lib/templates/url_select.mustache
@@ -8,6 +8,19 @@
         "formid": "url_select_form",
         "sesskey": "sesskey",
         "label": "core/url_select",
+        "helpicon": {
+            "title": "Help with something",
+            "text": "Help with something",
+            "url": "http://example.org/help",
+            "linktext": "",
+            "icon":{
+                "extraclasses": "iconhelp",
+                "attributes": [
+                    {"name": "src", "value": "../../../pix/help.svg"},
+                    {"name": "alt", "value": "Help icon"}
+                ]
+            }
+        },
         "showbutton": "Go",
         "options": [{
             "name": "Group 1", "isgroup": true, "options":
@@ -25,30 +38,28 @@
 <div class="{{classes}}">
     <form method="post" action="{{action}}" class="form-inline" id="{{formid}}">
         <input type="hidden" name="sesskey" value="{{sesskey}}">
-        <div class="form-group">
-            {{#label}}
-                <label for="{{id}}"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>
-                    {{label}}
-                </label>
-            {{/label}}
-            {{#helpicon}}
-                {{>core/help_icon}}
-            {{/helpicon}}
-            <select {{#attributes}}{{name}}="{{value}}" {{/attributes}} id="{{id}}" class="custom-select {{classes}}" name="jump">
-                {{#options}}
-                    {{#isgroup}}
-                        <optgroup label="{{name}}">
-                            {{#options}}
-                                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-                            {{/options}}
-                        </optgroup>
-                    {{/isgroup}}
-                    {{^isgroup}}
-                        <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-                    {{/isgroup}}
-                {{/options}}
-            </select>
-        </div>
+        {{#label}}
+            <label for="{{id}}"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>
+                {{label}}
+            </label>
+        {{/label}}
+        {{#helpicon}}
+            {{>core/help_icon}}
+        {{/helpicon}}
+        <select {{#attributes}}{{name}}="{{value}}" {{/attributes}} id="{{id}}" class="custom-select {{classes}}" name="jump">
+            {{#options}}
+                {{#isgroup}}
+                    <optgroup label="{{name}}">
+                        {{#options}}
+                            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+                        {{/options}}
+                    </optgroup>
+                {{/isgroup}}
+                {{^isgroup}}
+                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+                {{/isgroup}}
+            {{/options}}
+        </select>
         {{#showbutton}}
             <input type="submit" class="btn btn-secondary" value="{{showbutton}}">
         {{/showbutton}}
diff --git a/theme/bootstrapbase/less/moodle/forms.less b/theme/bootstrapbase/less/moodle/forms.less
index 05a97889ace..bb4ec76b90a 100644
--- a/theme/bootstrapbase/less/moodle/forms.less
+++ b/theme/bootstrapbase/less/moodle/forms.less
@@ -122,6 +122,15 @@ form {
     margin-right: .3em;
 }
 
+.custom-select {
+    max-width: 100%;
+}
+
+// Make the submit button align with the .custom-select element.
+.custom-select + input[type="submit"] {
+    margin: 0 0 0 5px;
+}
+
 #portfolio-add-button {
     display: inline;
 }
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 09911c93394..40502c60d9d 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -16539,6 +16539,12 @@ form {
 .singleselect label {
   margin-right: .3em;
 }
+.custom-select {
+  max-width: 100%;
+}
+.custom-select + input[type="submit"] {
+  margin: 0 0 0 5px;
+}
 #portfolio-add-button {
   display: inline;
 }