diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 0dccec9..6b9dd66 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -17,21 +17,24 @@
 <template>
 	<section class="sidebar" role="none" ref="sidebar">
 		<header class="sidebar__buttons">
-			<button ref="maps-button" v-if="mapCount > 1 || serverCount > 1" class="button--maps" data-section="maps"
+			<button ref="maps-button" v-if="mapCount > 1 || serverCount > 1" type="button"
+			        class="button--maps" data-section="maps"
 			        :title="mapCount > 1 ? messageWorlds : messageServers"
 			        :aria-label="mapCount > 1 ? messageWorlds : messageServers"
 			        :aria-expanded="mapsVisible"
 			        @click="handleSectionClick" @keydown="handleSectionKeydown">
 				<SvgIcon ref="maps-icon" :name="mapCount > 1 ? 'maps' : 'servers'"></SvgIcon>
 			</button>
-			<button ref="markers-button" v-if="markerUIEnabled" class="button--markers" data-section="markers"
+			<button ref="markers-button" v-if="markerUIEnabled" type="button"
+			        class="button--markers" data-section="markers"
 			        :title="messageMarkers"
 			        :aria-label="messageMarkers"
 			        :aria-expanded="markersVisible"
 			        @click="handleSectionClick" @keydown="handleSectionKeydown">
 				<SvgIcon name="marker_point"></SvgIcon>
 			</button>
-			<button ref="players-button" v-if="playerMakersEnabled" class="button--players" data-section="players"
+			<button ref="players-button" v-if="playerMakersEnabled" type="button"
+			        class="button--players" data-section="players"
 			        :title="messagePlayers" :aria-label="messagePlayers" :aria-expanded="playersVisible"
 			        @click="handleSectionClick" @keydown="handleSectionKeydown">
 				<SvgIcon name="players"></SvgIcon>
diff --git a/src/components/list/MarkerSetList.vue b/src/components/list/MarkerSetList.vue
index 41127d9..3cdbf0b 100644
--- a/src/components/list/MarkerSetList.vue
+++ b/src/components/list/MarkerSetList.vue
@@ -27,7 +27,7 @@
 
 	<template v-else>
 		<div ref="subHeader" class="markers__header">
-			<button ref="backButton" class="markers__back" @click.prevent="currentSet = undefined">
+			<button type="button" ref="backButton" class="markers__back" @click.prevent="currentSet = undefined">
 				<SvgIcon name="arrow"></SvgIcon>
 			</button>
 			<h3 class="markers__set">{{ currentSet.label }}</h3>