diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index ccf1ad588..c5913b325 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -201,6 +201,8 @@
 
 		<Modal v-if="modalShow" :title="t('deck', 'Add card on Today')" @close="modalShow=false">
 			<div class="modal__content">
+				{{ lastBoardId }}
+				{{ lastListId }}
 				<h3>{{ t('deck', 'Add card on Today') }}</h3>
 				<Multiselect v-model="selectedBoard"
 					:placeholder="t('deck', 'Select a board')"
@@ -280,6 +282,8 @@ export default {
 		...mapGetters([
 			'canEdit',
 			'canManage',
+			'lastBoardId',
+			'lastListId',
 		]),
 		...mapState({
 			compactMode: state => state.compactMode,
@@ -318,6 +322,15 @@ export default {
 		board() {
 			this.clearFilter()
 		},
+		lastBoardId() {
+
+			if (this.lastBoardId === null || this.lastBoardId === 0) {
+				return
+			}
+			this.selectedBoard = this.boards.filter(board => {
+				return board.id === this.lastBoardId
+			})
+		},
 	},
 	methods: {
 		beforeSetFilter(e) {
@@ -390,6 +403,8 @@ export default {
 					duedate: today.toISOString(),
 				})
 				this.newCardTitle = ''
+				this.$store.dispatch('storeLastListId', this.selectedStack.id)
+				this.$store.dispatch('storeLastBoardId', this.selectedBoard.id)
 			} catch (e) {
 				showError('Could not create card: ' + e.response.data.message)
 			}
diff --git a/src/store/main.js b/src/store/main.js
index dc25160ab..813f8cc0c 100644
--- a/src/store/main.js
+++ b/src/store/main.js
@@ -62,6 +62,8 @@ export default new Vuex.Store({
 		navShown: true,
 		compactMode: localStorage.getItem('deck.compactMode') === 'true',
 		cardDetailsInModal: localStorage.getItem('deck.cardDetailsInModal') === 'true',
+		lastBoardId: localStorage.getItem('deck.lastBoardId'),
+		lastListId: localStorage.getItem('deck.lastListId'),
 		sidebarShown: false,
 		currentBoard: null,
 		currentCard: null,
@@ -81,6 +83,12 @@ export default new Vuex.Store({
 		cardDetailsInModal: state => {
 			return state.cardDetailsInModal
 		},
+		lastBoardId: state => {
+			return state.lastBoardId
+		},
+		lastListId: state => {
+			return state.lastListId
+		},
 		getSearchQuery: state => {
 			return state.searchQuery
 		},
@@ -218,6 +226,12 @@ export default new Vuex.Store({
 			state.cardDetailsInModal = !state.cardDetailsInModal
 			localStorage.setItem('deck.cardDetailsInModal', state.cardDetailsInModal)
 		},
+		storeLastBoardId(state, boardId) {
+			localStorage.setItem('deck.lastBoardId', boardId)
+		},
+		storeLastListId(state, listId) {
+			localStorage.setItem('deck.lastListId', listId)
+		},
 		setBoards(state, boards) {
 			state.boards = boards
 		},
@@ -422,6 +436,12 @@ export default new Vuex.Store({
 		setCardDetailsInModal({ commit }, show) {
 			commit('setCardDetailsInModal', show)
 		},
+		storeLastBoardId({ commit }, boardId) {
+			commit('storeLastBoardId', boardId)
+		},
+		storeLastListId({ commit }, listId) {
+			commit('storeLastListId', listId)
+		},
 		setCurrentBoard({ commit }, board) {
 			commit('setCurrentBoard', board)
 		},