diff --git a/src/components/Icons/MarkdownPencil.vue b/src/components/Icons/MarkdownPencil.vue
new file mode 100644
index 000000000..3f60c518b
--- /dev/null
+++ b/src/components/Icons/MarkdownPencil.vue
@@ -0,0 +1,27 @@
+<template>
+  <span class="material-design-icon">
+     <svg-icon type="mdi" :path="path" :width="size" :height="size"></svg-icon>
+  </span>
+</template>
+
+<script>
+import SvgIcon from '@jamescoyle/vue-icon';
+import { mdiPencil } from '@mdi/js';
+export default {
+	name: "MarkdownPencil",
+	components: {
+		SvgIcon
+	},
+	props: {
+		size: {
+			type: Number,
+			default: 24
+		},
+	},
+	data() {
+		return {
+			path: mdiPencil,
+		}
+	}
+}
+</script>
diff --git a/src/components/NoteItem.vue b/src/components/NoteItem.vue
index 56ab9cb48..047d86bd9 100644
--- a/src/components/NoteItem.vue
+++ b/src/components/NoteItem.vue
@@ -24,37 +24,58 @@
 				:size="20"
 				fill-color="var(--color-text-lighter)"
 			/>
+
 		</template>
 		<template #actions>
 			<NcActionButton :icon="actionFavoriteIcon" @click="onToggleFavorite">
 				{{ actionFavoriteText }}
 			</NcActionButton>
+
+			<NcActionButton v-if="!renaming" @click="startRenaming">
+				<MarkdownPencil slot="icon" :size="20"/>
+				{{ t('notes', 'Rename') }}
+			</NcActionButton>
+			<NcActionInput v-else
+				v-model.trim="newTitle"
+				@input="onInputChange($event)"
+				@submit="onRename"
+				:disabled="!renaming"
+				:placeholder="t('notes', 'Rename note')"
+				:show-trailing-button="true"
+			>
+				<MarkdownPencil slot="icon" :size="20"/>
+			</NcActionInput>
+
 			<NcActionButton @click="onToggleSidebar">
-				<SidebarIcon slot="icon" :size="20" />
+				<SidebarIcon slot="icon" :size="20"/>
 				{{ t('notes', 'Details') }}
 			</NcActionButton>
+
 			<NcActionButton v-if="!note.readonly" :icon="actionDeleteIcon" @click="onDeleteNote">
 				{{ t('notes', 'Delete note') }}
 			</NcActionButton>
-			<NcActionSeparator />
+
+			<NcActionSeparator/>
+
 			<NcActionButton icon="icon-files-dark" @click="onCategorySelected">
 				{{ actionCategoryText }}
 			</NcActionButton>
+
 		</template>
 	</NcListItem>
 </template>
 
 <script>
-import { NcListItem, NcActionButton } from '@nextcloud/vue'
+import {NcListItem, NcActionButton, NcActionInput} from '@nextcloud/vue'
 import AlertOctagonIcon from 'vue-material-design-icons/AlertOctagon.vue'
 import FileDocumentOutlineIcon from 'vue-material-design-icons/FileDocumentOutline.vue'
 import StarIcon from 'vue-material-design-icons/Star.vue'
 import SidebarIcon from 'vue-material-design-icons/PageLayoutSidebarRight.vue'
-import { categoryLabel, routeIsNewNote } from '../Util.js'
-import { showError } from '@nextcloud/dialogs'
+import {categoryLabel, routeIsNewNote} from '../Util.js'
+import {showError} from '@nextcloud/dialogs'
 import store from '../store.js'
-import { setFavorite, setTitle, fetchNote, deleteNote } from '../NotesService.js'
-
+import {setFavorite, setTitle, fetchNote, deleteNote} from '../NotesService.js'
+import MarkdownPencil from "./Icons/MarkdownPencil.vue";
 export default {
 	name: 'NoteItem',
 
@@ -65,6 +86,9 @@ export default {
 		NcListItem,
 		SidebarIcon,
 		StarIcon,
+		NcActionInput,
+		MarkdownPencil,
+
 	},
 
 	props: {
@@ -72,6 +96,7 @@ export default {
 			type: Object,
 			required: true,
 		},
+
 	},
 
 	data() {
@@ -79,6 +104,8 @@ export default {
 			loading: {
 				note: false,
 			},
+			newTitle: "",
+			renaming: false,
 		}
 	},
 
@@ -112,7 +139,6 @@ export default {
 			return 'icon-delete' + (this.loading.delete ? ' loading' : '')
 		},
 	},
-
 	methods: {
 		onNoteSelected(noteId) {
 			this.$emit('note-selected', noteId)
@@ -135,20 +161,41 @@ export default {
 			this.actionsOpen = false
 			store.commit('setSidebarOpen', !store.state.app.sidebarOpen)
 		},
+		startRenaming() {
+			this.renaming = true;
+			this.$emit('start-renaming', this.note.id);
+		},
+		onInputChange(event) {
+			this.newTitle = event.target.value.toString();
+		},
 		onRename(newTitle) {
-			this.loading.note = true
+			newTitle = this.newTitle.toString();
+			if (!newTitle) {
+				return;
+			}
+			this.loading.note = true;
 			setTitle(this.note.id, newTitle)
+				.then(() => {
+					this.note.title = newTitle;
+					this.newTitle = "";
+				})
 				.catch(() => {
+					console.log('error')
+					showError(this.t('notes', 'Error while renaming note.'));
 				})
 				.finally(() => {
-					this.loading.note = false
-				})
+					this.loading.note = false;
+					this.renaming = false;
+				});
+
 			if (routeIsNewNote(this.$route)) {
 				this.$router.replace({
 					name: 'note',
-					params: { noteId: this.note.id.toString() },
-				})
+					params: {noteId: this.note.id.toString()},
+				});
 			}
+			this.renaming = false;
+
 		},
 		async onDeleteNote() {
 			this.loading.delete = true
diff --git a/src/components/NotesList.vue b/src/components/NotesList.vue
index 5b7124b5f..779b51244 100644
--- a/src/components/NotesList.vue
+++ b/src/components/NotesList.vue
@@ -4,6 +4,8 @@
 			:key="note.id"
 			:note="note"
 			@note-selected="onNoteSelected"
+			:renaming="isRenaming(note.id)"
+			@start-renaming="onStartRenaming"
 		/>
 	</ul>
 </template>
@@ -24,11 +26,22 @@ export default {
 			required: true,
 		},
 	},
-
+	data() {
+		return {
+			renamingNotes: [],
+		};
+	},
 	methods: {
 		onNoteSelected(noteId) {
 			this.$emit('note-selected', noteId)
 		},
+		onStartRenaming(noteId) {
+			this.renamingNotes.push(noteId);
+		},
+		isRenaming(noteId) {
+			return this.renamingNotes.includes(noteId);
+		},
+
 	},
 }
 </script>