diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index a9722053f..1052577a8 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -38,13 +38,13 @@
 		</div>
 		<div v-if="board" class="board-actions">
 			<div id="stack-add">
-				<form>
+				<form @submit.prevent="clickAddNewStack()">
 					<label for="new-stack-input-main" class="hidden-visually">Add a new stack</label>
 					<input id="new-stack-input-main" v-model="newStackTitle" type="text"
 						class="no-close"
-						placeholder="Add a new stack" @keyup.enter="clickAddNewStack()">
-					<input class="icon-confirm" type="button" title="Submit"
-						@click="clickAddNewStack()">
+						placeholder="Add a new stack">
+					<input v-tooltip="t('deck', 'clickAddNewStack')" class="icon-confirm" type="submit"
+						value="">
 				</form>
 			</div>
 			<div class="board-action-buttons">
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index dc8990da0..f9dcad94f 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -35,7 +35,7 @@
 					<ActionButton icon="icon-user" @click="assignCardToMe()">{{ t('deck', 'Assign to me') }}</ActionButton>
 					<ActionButton icon="icon-archive" @click="archiveUnarchiveCard()">{{ t('deck', (showArchived ? 'Unarchive card' : 'Archive card')) }}</ActionButton>
 					<ActionButton icon="icon-delete" @click="deleteCard()">{{ t('deck', 'Delete card') }}</ActionButton>
-					<ActionButton icon="icon-settings-dark" @click="setCurrentCard()">{{ t('deck', 'Card details') }}</ActionButton>
+					<ActionButton icon="icon-settings-dark" @click="openCard">{{ t('deck', 'Card details') }}</ActionButton>
 				</Actions>
 
 			</transition>
@@ -132,11 +132,7 @@ export default {
 			this.copiedCard = Object.assign({}, this.card)
 			this.copiedCard.newUserUid = this.card.owner.uid
 			this.$store.dispatch('assignCardToUser', this.copiedCard)
-		},
-		setCurrentCard() {
-			this.$store.dispatch('setCurrentCard', this.card)
 		}
-
 	}
 }
 </script>