diff --git a/skins/elastic/templates/addressbook.html b/skins/elastic/templates/addressbook.html
index 4e1bf5b2a..197fad65e 100644
--- a/skins/elastic/templates/addressbook.html
+++ b/skins/elastic/templates/addressbook.html
@@ -40,7 +40,7 @@
 			</ul>
 		</div>
 		<div class="formbuttons">
-			<button class="btn btn-primary icon search" href="#" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
+			<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
 		</div>
 	</div>
 	<div class="scroller">
diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index bbf12ef4c..e48ec122e 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -21,7 +21,7 @@
 			<h2 id="aria-label-compose-attachments" class="voice"><roundcube:label name="attachments" /></h2>
 			<div class="upload-form">
 				<roundcube:object name="composeAttachmentForm" mode="hint" />
-				<button class="btn btn-secondary attach" tabindex="2" href="#" onclick="rcmail.upload_input('uploadform')"><roundcube:label name="addattachment" /></button>
+				<button type="button" class="btn btn-secondary attach" tabindex="2" onclick="rcmail.upload_input('uploadform')"><roundcube:label name="addattachment" /></button>
 			</div>
 			<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" tabindex="2" />
 			<roundcube:object name="fileDropArea" id="compose-attachments" />
diff --git a/skins/elastic/templates/folders.html b/skins/elastic/templates/folders.html
index 94f1ebccc..8c70647d5 100644
--- a/skins/elastic/templates/folders.html
+++ b/skins/elastic/templates/folders.html
@@ -19,7 +19,7 @@
 			<roundcube:object name="folderfilter" id="folderlist-filter" noheader="true" noevent="true" />
 		</div>
 		<div class="formbuttons">
-			<button class="btn btn-primary icon search" href="#" onclick="rcmail.folder_filter($('#folderlist-filter').val())"><roundcube:label name="search" /></button>
+			<button type="button" class="btn btn-primary icon search" onclick="rcmail.folder_filter($('#folderlist-filter').val())"><roundcube:label name="search" /></button>
 		</div>
 	</div>
 	<div class="scroller" tabindex="-1">
diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
index c201a8631..63ea278a7 100644
--- a/skins/elastic/templates/mail.html
+++ b/skins/elastic/templates/mail.html
@@ -81,7 +81,7 @@
 			</div>
 		</div>
 		<div class="formbuttons">
-			<button class="btn btn-primary icon search" href="#" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
+			<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
 		</div>
 	</div>
 	<div id="messagelist-content" class="scroller" tabindex="-1">