diff --git a/src/components/notes-list/note-card/NoteCard.scss b/src/components/notes-list/note-card/NoteCard.scss
index 6027457..8e791cb 100644
--- a/src/components/notes-list/note-card/NoteCard.scss
+++ b/src/components/notes-list/note-card/NoteCard.scss
@@ -40,6 +40,14 @@
           color: lighten($dark, 20%);
         }
       }
+      
+      #convert-note {
+        color: $dark;
+        
+        &:hover {
+          color: lighten($dark, 20%);
+        }
+      }
     }
   }
 
diff --git a/src/components/notes-list/note-card/NoteCard.vue b/src/components/notes-list/note-card/NoteCard.vue
index 73c0418..f35198d 100644
--- a/src/components/notes-list/note-card/NoteCard.vue
+++ b/src/components/notes-list/note-card/NoteCard.vue
@@ -7,10 +7,7 @@
             <div id="name-category" class="column is-9">
               <h4 v-if="gistsSelected">
                 {{ note.description }}
-                <b-icon
-                  class="visibility-icon"
-                  :icon="note.public ? 'globe' : 'lock'"
-                ></b-icon>
+                <b-icon class="visibility-icon" :icon="note.public ? 'globe' : 'lock'"></b-icon>
               </h4>
               <h3 v-else>{{ note.name }}</h3>
             </div>
@@ -25,17 +22,18 @@
                   <b-icon icon="github"></b-icon>
                 </a>
                 <a
-                  id="update-note"
-                  @click="showUpdateNoteModal(note.name)"
-                  title="Edit note"
+                  id="convert-note"
+                  v-if="!gistsSelected && githubToken"
+                  @click="convertNoteToGist"
+                  title="Convert to gist"
                 >
+                  <b-icon icon="share" size="is-small"></b-icon>
+                  <b-icon icon="github"></b-icon>
+                </a>
+                <a id="update-note" @click="showUpdateNoteModal(note.name)" title="Edit note">
                   <b-icon icon="pencil"></b-icon>
                 </a>
-                <a
-                  id="delete-note"
-                  @click="deleteNoteModal()"
-                  title="Delete note"
-                >
+                <a id="delete-note" @click="deleteNoteModal()" title="Delete note">
                   <b-icon icon="trash"></b-icon>
                 </a>
               </div>
@@ -49,18 +47,13 @@
             :data="tag"
             :style="'background-color: ' + stringToColour(tag) + ';'"
             :key="tag.text"
-            >{{ tag }}</b-tag
-          >
+          >{{ tag }}</b-tag>
 
-          <div
-            class="note-file"
-            v-for="(value, key, index) in note.files"
-            :key="index"
-          >
+          <div class="note-file" v-for="(value, key, index) in note.files" :key="index">
             <h4>
               {{ value.name }}
-              <span class="note-file-small"
-                >({{ value.language }})
+              <span class="note-file-small">
+                ({{ value.language }})
                 <a
                   id="copy-file"
                   v-clipboard:copy="value.content"
@@ -128,10 +121,10 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(["notes", "gistsSelected"])
+    ...mapGetters(["notes", "gistsSelected", "githubToken"])
   },
   methods: {
-    ...mapActions(["updateNote", "deleteNote"]),
+    ...mapActions(["updateNote", "deleteNote", "convertToGist", "selectGists"]),
     stringToColour(str) {
       const colorHash = new ColorHash({ lightness: 0.5, saturation: 0.6 });
       return colorHash.hex(str);
@@ -156,6 +149,37 @@ export default {
         }
       });
     },
+    convertNoteToGist() {
+      this.convertToGist(this.note)
+        .then(() => {
+          this.$buefy.dialog.confirm({
+            title: "Successful",
+            message:
+              "Note was converted to gist.<br>Do you want to delete local note ?",
+            confirmText: "Delete",
+            cancelText: "Keep",
+            type: "is-success",
+            icon: "check-circle",
+            hasIcon: true,
+            onConfirm: () => {
+              this.deleteNote(this.note);
+              this.selectGists(true);
+            },
+            onCancel: () => {
+              this.selectGists(true);
+            }
+          });
+        })
+        .catch(() => {
+          this.$buefy.dialog.alert({
+            title: "Error",
+            message: "Note was not converted to gist.<br>Please retry later.",
+            type: "is-danger",
+            hasIcon: true,
+            icon: "times-circle"
+          });
+        });
+    },
     onCopyClipboardSuccess() {
       this.$toast.open({
         message: "Copied",
diff --git a/src/converter.js b/src/converter.js
index 9bd4741..d3903d8 100644
--- a/src/converter.js
+++ b/src/converter.js
@@ -48,17 +48,20 @@ const converter = {
   },
   noteToGist(note) {
     const files = {};
-
-    note.files.forEach(file => {
-      files[`${file.name}.${this.languageToExtension(file.language)}`] = {
-        content: file.content
+    Object.keys(note.files).forEach(key => {
+      files[
+        `${note.files[key].name}.${this.languageToExtension(
+          note.files[key].language
+        )}`
+      ] = {
+        content: note.files[key].content
       };
     });
 
     return {
       id: note.id,
       public: note.public,
-      description: note.description,
+      description: `${note.name} - ${note.description}`,
       files
     };
   }
diff --git a/src/store/modules/Note.js b/src/store/modules/Note.js
index 83f41ea..6d2a496 100644
--- a/src/store/modules/Note.js
+++ b/src/store/modules/Note.js
@@ -114,6 +114,10 @@ const actions = {
       actions.writeFileToFS(note, false);
     }
   },
+  convertToGist(store, note) {
+    const octokit = getOctokit(store.rootState.Settings.settings);
+    return octokit.gists.create(converter.noteToGist(note));
+  },
   updateNote(store, note) {
     if (store.state.gistsSelected) {
       const octokit = getOctokit(store.rootState.Settings.settings);
diff --git a/src/store/modules/Settings.js b/src/store/modules/Settings.js
index cd34bf4..d94978b 100644
--- a/src/store/modules/Settings.js
+++ b/src/store/modules/Settings.js
@@ -43,7 +43,8 @@ const actions = {
 };
 
 const getters = {
-  settings: state => state.settings
+  settings: state => state.settings,
+  githubToken: state => state.settings.githubPersonalAccessToken
 };
 
 export default {