diff --git a/contribs/gmf/src/directives/importdatasource.js b/contribs/gmf/src/directives/importdatasource.js
index 04e7c1e485e..ff21e54a0ee 100644
--- a/contribs/gmf/src/directives/importdatasource.js
+++ b/contribs/gmf/src/directives/importdatasource.js
@@ -17,7 +17,7 @@ goog.require('ngeo.datasource.OGC');
 gmf.ImportdatasourceController = class {
 
   /**
-   * @param {!angular.JQLite} $element Element.
+   * @param {!jQuery} $element Element.
    * @param {!angular.$filter} $filter Angular filter.
    * @param {!angular.$injector} $injector Main injector.
    * @param {!angular.Scope} $scope Angular scope.
@@ -47,7 +47,7 @@ gmf.ImportdatasourceController = class {
     // Injected properties
 
     /**
-     * @type {!angular.JQLite}
+     * @type {!jQuery}
      * @private
      */
     this.element_ = $element;
@@ -95,7 +95,7 @@ gmf.ImportdatasourceController = class {
     // Inner properties
 
     /**
-     * @type {!angular.JQLite}
+     * @type {!jQuery}
      * @private
      */
     this.fileInput_ = $element.find('input[type=file]');
@@ -226,6 +226,7 @@ gmf.ImportdatasourceController = class {
       this.timeout_(() => {
         goog.asserts.assert(this.serversEngine_);
         const $urlInput = this.element_.find('input[name=url]');
+        const $connectBtn = this.element_.find('button.gmf-importdatasource-connect-btn');
         $urlInput.typeahead({
           hint: true,
           highlight: true,
@@ -233,6 +234,12 @@ gmf.ImportdatasourceController = class {
         }, {
           name: 'url',
           source: this.serversEngine_.ttAdapter()
+        }).bind('typeahead:select', (ev, suggestion) => {
+          this.timeout_(() => {
+            this.url = suggestion;
+            this.scope_.$apply();
+            $connectBtn.focus();
+          });
         });
       });
     }
diff --git a/contribs/gmf/src/directives/partials/importdatasource.html b/contribs/gmf/src/directives/partials/importdatasource.html
index f1d173672ca..53e514263cd 100644
--- a/contribs/gmf/src/directives/partials/importdatasource.html
+++ b/contribs/gmf/src/directives/partials/importdatasource.html
@@ -67,7 +67,7 @@
     </div>
     <div class="form-group">
       <button
-        class="btn btn-sm btn-default form-control"
+        class="btn btn-sm btn-default form-control gmf-importdatasource-connect-btn"
         title="{{'Connect to online resource' | translate}}"
         type="submit"
         ng-click="idsc_form.$valid && $ctrl.connect()"