diff --git a/src/angular-advanced-searchbox.html b/src/angular-advanced-searchbox.html
index 2452429..2b66397 100644
--- a/src/angular-advanced-searchbox.html
+++ b/src/angular-advanced-searchbox.html
@@ -16,7 +16,7 @@
                        nit-auto-size-input
                        nit-set-focus="searchParam.editMode"
                        ng-keydown="keydown($event, $index)"
-                       ng-blur="leaveEditMode($event, $index)"
+                       ng-blur="maybeLeaveEditMode($event, $index)"
                        ng-show="searchParam.editMode"
                        ng-change="searchParam.restrictToSuggestedValues !== true ? searchParamValueChanged(searchParam) : null"
                        ng-model="searchParam.value"
@@ -46,4 +46,4 @@
         <span class="title">{{parametersLabel}}:</span>
         <span class="search-parameter" ng-repeat="param in parameters | filter:isUnsedParameter | limitTo:parametersDisplayLimit" ng-mousedown="addSearchParam(param)">{{param.name}}</span>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/angular-advanced-searchbox.js b/src/angular-advanced-searchbox.js
index c128b17..b48c8b6 100644
--- a/src/angular-advanced-searchbox.js
+++ b/src/angular-advanced-searchbox.js
@@ -90,7 +90,16 @@ angular.module('angular-advanced-searchbox', [])
 
                         $scope.$emit('advanced-searchbox:enteredEditMode', searchParam);
                     };
-
+                    /**
+                     * Fix to prevent ignoring of the Click-Selection of a typeahead Element
+                     **/
+                    $scope.maybeLeaveEditMode = function (e, index) {
+                        if(e.relatedTarget !== null && e.relatedTarget.parentElement.id.indexOf("typeahead")!=-1){
+                            return false;
+                        }else{
+                            return  $scope.leaveEditMode(e,index);
+                        }
+                    };
                     $scope.leaveEditMode = function(e, index) {
                         if (index === undefined)
                             return;