diff --git a/ng2-components/ng2-alfresco-search/src/components/search-control.component.html b/ng2-components/ng2-alfresco-search/src/components/search-control.component.html
index 1d130f262a..fd6374f91f 100644
--- a/ng2-components/ng2-alfresco-search/src/components/search-control.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.html
@@ -1,13 +1,13 @@
 <form #f="ngForm" (ngSubmit)="onSearch(f.value)" class="adf-search-form">
     <div class="adf-search-container"
         [@transitionMessages]="subscriptAnimationState">
-        <button md-button
+        <a md-button
                 *ngIf="expandable"
                 id="adf-search-button"
             (click)="toggleSearchBar()"
             class="adf-search-button">
             <md-icon aria-label="search button">search</md-icon>
-        </button>
+        </a>
         <div class="adf-search-field">
             <md-input-container>
                 <input
diff --git a/ng2-components/ng2-alfresco-search/src/components/search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/search-control.component.spec.ts
index c71e63e765..eba7454912 100644
--- a/ng2-components/ng2-alfresco-search/src/components/search-control.component.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.spec.ts
@@ -340,6 +340,28 @@ describe('SearchControlComponent', () => {
             }, 500);
         });
 
+        it('click on the search button should not trigger the search when you click on it to close the search bar', (done) => {
+            spyOn(searchService, 'getQueryNodesPromise')
+                .and.returnValue(Promise.resolve(results));
+
+            component.liveSearchTerm = 'test';
+
+            fixture.detectChanges();
+            component.subscriptAnimationState = 'active';
+
+            let searchButton: any = element.querySelector('#adf-search-button');
+            searchButton.click();
+
+            setTimeout(() => {
+                fixture.detectChanges();
+                expect(component.liveSearchComponent.panelAnimationState).not.toBe('void');
+                let resultElement: Element = element.querySelector('#adf-search-results');
+                expect(resultElement).toBe(null);
+                done();
+                done();
+            }, 500);
+        });
+
         it('click on the search button should open the input box when is close', (done) => {
             fixture.detectChanges();
             component.subscriptAnimationState = 'inactive';