diff --git a/src/index.html b/src/index.html
index 94e060e..bd7fd2f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -66,7 +66,7 @@ <h4>
                     <ul class="dropdown-menu">
                       <li>
                         <a href="#" data-bind="click: defaultContextDialog">
-                          <span data-bind="text: defaultCtx.name"></span>
+                          <span data-bind="text: defaultCtxName"></span>
                         </a>
                       </li>
                       <li role="separator" class="divider"></li>
diff --git a/src/js/app.js b/src/js/app.js
index 1d6878c..782ef1b 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -80,7 +80,8 @@ requirejs(
     function AppVm() {
       const contexts = ko.observableArray()
       const selectedCtx = new ContextVm()
-      let defaultCtx = new ContextVm()
+      const defaultCtxName = 'default';
+      let defaultCtxIdx = -1;
 
       const bookmarkSelected = new BookmarkSelectedVm() // bookmark loaded
       let tabCounter = 0
@@ -163,15 +164,15 @@ requirejs(
       }
 
       const defaultContextDialog = () => {
-        contextDialog(defaultCtx)
+        contextDialog(_getDefaultCtx())
       }
 
       const contextDialogByName = () => {
         let ctxToLoad = contexts().find(
-          (ctx) => ctx.name() === request.context()
+          ctx => ctx.name() === request.context()
         )
         if (ctxToLoad === undefined) {
-          ctxToLoad = defaultCtx
+          ctxToLoad = _getDefaultCtx()
         }
         contextDialog(ctxToLoad)
       }
@@ -533,9 +534,9 @@ requirejs(
       // Note that elements order is important
       const _mapContext = () =>
         [
-          defaultCtx,
+          _getDefaultCtx(),
           request.context() !== 'default' &&
-            contexts().find((ctx) => ctx.name() === request.context()),
+            contexts().find(ctx => ctx.name() === request.context()),
         ]
           .filter((ctx) => !!ctx)
           .map((ctx) => _extractCtxVars(ctx.variables()))
@@ -661,7 +662,7 @@ requirejs(
           name: selectedCtx.name(),
           variables: _extractModelFromVM(selectedCtx.variables()),
         })
-        const contextToEditIdx = contexts().find(
+        const contextToEditIdx = contexts().findIndex(
           (ctx) => ctx.name === selectedCtx.name()
         )
         if (contextToEditIdx > -1) {
@@ -690,25 +691,27 @@ requirejs(
         // load contexts
         const loadedCtxs = []
         storage.loadContexts(
-          (ctx) => {
+          ctx => {
             loadedCtxs.push(new ContextVm(ctx.name, ctx.variables))
           },
           () => {
-            const defaultCtxIdx = loadedCtxs.findIndex(
-              (ctx) => ctx.name() === 'default'
+            defaultCtxIdx = loadedCtxs.findIndex(
+              ctx => ctx.name() === 'default'
             )
             if (defaultCtxIdx < 0) {
-              // default context
-              defaultCtx = new ContextVm()
-            } else {
-              defaultCtx = loadedCtxs[defaultCtxIdx]
+              defaultCtxIdx = 0
+              contexts.push(new ContextVm())
             }
-            loadedCtxs.forEach((ctx) => contexts.push(ctx))
+            loadedCtxs.forEach(ctx => contexts.push(ctx))
             contexts.sort(sortCriteriaCtx)
           }
         )
       }
 
+      const _getDefaultCtx = () => {
+        return defaultCtxIdx >= 0 ? contexts()[defaultCtxIdx] : new ContextVm()
+      }
+
       const dismissConfirmDialog = () => {
         showConfirmDialog(false)
       }
@@ -884,7 +887,8 @@ requirejs(
       return {
         contexts,
         selectedCtx,
-        defaultCtx,
+        defaultCtxName,
+        defaultCtxIdx,
 
         bookmarkSelected,
         tabCounter,
diff --git a/src/js/app/bookmark.js b/src/js/app/bookmark.js
index 1cfe7dc..b035c89 100644
--- a/src/js/app/bookmark.js
+++ b/src/js/app/bookmark.js
@@ -63,7 +63,7 @@ define(function () {
 
   const addBookmarks = (folder, bookmarks = []) => {
     const newFolder = Object.assign({}, folder)
-    newFolder.bookmarks = folder.bookmarks.concat(bookmarks)
+    newFolder.bookmarks = folder.bookmarks ? folder.bookmarks.concat(bookmarks) : [].concat(bookmarks)
     return newFolder
   }
 
@@ -73,13 +73,13 @@ define(function () {
       b.id === id
 
   const sortBookmarks = (folder, criteria) => {
-    const bookmarks = folder.bookmarks
+    const bookmarks = folder.bookmarks ? folder.bookmarks : []
     bookmarks.sort(criteria)
     return Object.assign({}, folder, { bookmarks })
   }
 
   const replaceBookmark = (folder, bookmark) => {
-    const bookmarks = folder.bookmarks.slice()
+    const bookmarks = folder.bookmarks ? folder.bookmarks.slice() : []
     const indexToReplace = bookmarks.findIndex(bookmarkById(bookmark))
     if (indexToReplace !== -1) {
       bookmarks.splice(indexToReplace, 1, bookmark)
@@ -91,7 +91,7 @@ define(function () {
   }
 
   const removeBookmarks = (folder, bookmarksToRemove = []) => {
-    let bookmarks = folder.bookmarks.slice()
+    let bookmarks = folder.bookmarks ? folder.bookmarks.slice() : []
 
     const bookmarksToRemoveIds = (
       Array.isArray(bookmarksToRemove) ? bookmarksToRemove : [bookmarksToRemove]
@@ -187,22 +187,23 @@ define(function () {
   }
 
   const exportObj = (bookmarks = [], contexts = []) => {
+    const exportSelectedBookmark = bookmarks.length === 1 && !bookmarks[0].isFolder
     let harExport = {}
     harExport.log = {}
     harExport.log.version = '1.1'
     harExport.log.creator = {}
     harExport.log.creator.name = 'Resting WebExtension'
     harExport.log.creator.version = '1.0'
-    harExport.log.entries = _bookmarkToHar(bookmarks)
+    harExport.log.entries = _bookmarkToHar(bookmarks, exportSelectedBookmark)
     harExport.log._contexts = _contextsToHar(contexts)
     return harExport
   }
 
   const _contextsToHar = (contexts = []) => {
-    return contexts.map((c) => {
+    return contexts.map(ctx => {
       let contextHarField = {}
-      contextHarField.name = c.name
-      contextHarField.variables = c.variables.map((v) => ({
+      contextHarField.name = ctx.name
+      contextHarField.variables = ctx.variables.map(v => ({
         name: v.name,
         value: v.value,
         enabled: v.enabled,
@@ -211,7 +212,7 @@ define(function () {
     })
   }
 
-  const _bookmarkToHar = (sources = []) => {
+  const _bookmarkToHar = (sources = [], exportSelectedBookmark = false) => {
     let exported = []
     if (sources.length > 0) {
       let bookmarkExport = {}
@@ -219,7 +220,9 @@ define(function () {
       bookmarkExport._isFolder = sources[0].isFolder
       bookmarkExport._id = sources[0].id
       bookmarkExport._created = sources[0].created
-      bookmarkExport._folder = sources[0].folder
+      if (!exportSelectedBookmark) {
+        bookmarkExport._folder = sources[0].folder
+      }
       bookmarkExport.startedDateTime = '1970-01-01T00:00:00Z' // not supported
       bookmarkExport.request = {
         headersSize: -1,
diff --git a/src/js/app/components/bookmarks/bookmarksVm.js b/src/js/app/components/bookmarks/bookmarksVm.js
index f491415..e1974d4 100644
--- a/src/js/app/components/bookmarks/bookmarksVm.js
+++ b/src/js/app/components/bookmarks/bookmarksVm.js
@@ -52,7 +52,8 @@ define([
     const exportSrc = ko.observable('har')
 
     // contextual menu
-    const showContextMenu = ko.observable(false)
+    const showBookmarkContextMenu = ko.observable(false)
+    const showFolderContextMenu = ko.observable(false)
     const contextMenuPosX = ko.observable('0px')
     const contextMenuPosY = ko.observable('0px')
 
@@ -181,7 +182,8 @@ define([
         showBookmarkDeleteDialog(false)
         showImportDialog(false)
         showExportDialog(false)
-        showContextMenu(false)
+        showBookmarkContextMenu(false)
+        showFolderContextMenu(false)
       }
     }
     const loadBookmarkObj = (bookmarkObj) => {
@@ -192,7 +194,11 @@ define([
       const posX = event.clientY
       const posY = event.clientX
       bookmarkOfContextMenu = bookmark
-      showContextMenu(true)
+      if (bookmark.isFolder) {
+        showFolderContextMenu(true)
+      } else {
+        showBookmarkContextMenu(true)
+      }
       contextMenuPosX(`${posX}px`)
       contextMenuPosY(`${posY}px`)
     }
@@ -218,6 +224,33 @@ define([
       }
     }
 
+    const exportSelectedBookmarks = () => {
+      const contextsModels = _extractContextFromVM(contexts())
+      let contextsToExport = []
+      if(bookmarkOfContextMenu.isFolder) {
+        if(bookmarkOfContextMenu.bookmarks) {
+          contextsToExport = [...new Set(bookmarkOfContextMenu.bookmarks.map(b => b.request.context))]
+        }
+      } else {
+        contextsToExport.push(bookmarkOfContextMenu.request.context)
+      }
+      const selectedContexts = contextsModels.filter(cm => contextsToExport.includes(cm.name))
+      const exportContent = JSON.stringify(
+        bookmarkProvider.exportObj([bookmarkOfContextMenu], selectedContexts)
+      )
+      const exportFile = new File([exportContent], 'export.resting.json', {
+        type: 'application/json',
+      })
+
+      const url = URL.createObjectURL(exportFile)
+
+      chrome.downloads.download({
+        filename: exportFile.name,
+        url: url,
+        saveAs: true,
+      })
+    }
+
     const _handleImport = () => {
       const f = document.getElementById('import-file').files
       const fr = new FileReader()
@@ -240,7 +273,7 @@ define([
           }
         })
 
-        importedBookmarks.contexts.forEach((c) => _saveContext(c))
+        importedBookmarks.contexts.forEach(c => _saveContext(c))
       }
       if (f[0]) {
         fr.readAsText(f[0])
@@ -250,16 +283,26 @@ define([
 
     // FIXME: duplication of appVm function
     const _saveContext = (context = {}) => {
-      storage.saveContext({ name: context.name, variables: context.variables })
-      const contextToEdit = contexts().find(
-        (ctx) => ctx.name() === context.name
+      const contextToEditIdx = contexts().findIndex(
+        ctx => ctx.name() === context.name
       )
-      const contextVm = new ContextVm(context.name, context.variables)
-      if (contextToEdit) {
-        contexts.replace(contextToEdit, contextVm)
-      } else if (context.name != 'default') {
+      let contextToSave;
+      if (contextToEditIdx >= 0) {
+        // append variables to existent context
+        contextToSave = { name: context.name, variables: _extractItemFromVM(contexts()[contextToEditIdx].variables()).concat(context.variables) }
+      } else {
+        contextToSave = context
+      }
+      storage.saveContext(contextToSave)
+      const contextVm = new ContextVm(contextToSave.name, contextToSave.variables)
+      if (contextToEditIdx >= 0) {
+        contexts.replace(contexts()[contextToEditIdx], contextVm)
+      } else {
         contexts.push(contextVm)
       }
+      if (context.name === 'default') {
+        appVm.defaultCtxIdx = contextToEditIdx
+      }
     }
 
     const _handleExport = () => {
@@ -327,7 +370,8 @@ define([
     $(() => {
       // hide context menu on every click on page
       $('.row').on('click', function () {
-        showContextMenu(false)
+        showBookmarkContextMenu(false)
+        showFolderContextMenu(false)
       })
       _loadBookmarksNewFormat()
 
@@ -340,23 +384,6 @@ define([
           return h('bookmarks-menu')
         },
       })
-      /*new Vue({
-          el: '#v-bookmarks-buttons',
-          components: {
-            ImportButton, ExportButton, SortButton, AddFolderButton
-          },
-          render: function(h) {
-            return h(
-              'div', 
-              {},
-              [
-                h('add-folder-button'),
-                h('import-button'),
-                h('export-button'),
-                h('sort-button')
-              ])
-          }
-        })*/
     })
 
     /*
@@ -392,9 +419,11 @@ define([
       expandFolder,
       importBookmarks,
       exportBookmarks,
+      exportSelectedBookmarks,
       // context menu
       contextMenu,
-      showContextMenu,
+      showBookmarkContextMenu,
+      showFolderContextMenu,
       contextMenuPosX,
       contextMenuPosY,
       // context menu actions
diff --git a/src/js/app/components/bookmarks/bookmarks_view.html b/src/js/app/components/bookmarks/bookmarks_view.html
index e2dc709..e80397b 100644
--- a/src/js/app/components/bookmarks/bookmarks_view.html
+++ b/src/js/app/components/bookmarks/bookmarks_view.html
@@ -38,12 +38,12 @@
               <span data-bind="text: name"></span>
               <span class="pull-right">
                 <button
-                  class="btn btn-xs btn-danger"
-                  data-bind="click: $parent.confirmDelete, clickBubble: false">
-                  <span
-                    class="glyphicon glyphicon-trash"
-                    aria-hidden="true"></span>
-                </button>
+                class="btn btn-xs"
+                data-bind="click: $parent.contextMenu, clickBubble: false">
+                <span
+                  class="glyphicon glyphicon-menu-hamburger"
+                  aria-hidden="true"></span>
+              </button>
               </span>
             </a>
           </div>
@@ -120,7 +120,7 @@
 
   <div
     class="ctx-menu"
-    data-bind="visible: showContextMenu, style: {'position':'fixed', 'top': contextMenuPosX, 'left': contextMenuPosY }, clickBubble: false">
+    data-bind="visible: showBookmarkContextMenu, style: {'position':'fixed', 'top': contextMenuPosX, 'left': contextMenuPosY }, clickBubble: false">
     <ul class="list-group">
       <li class="list-group-item ctx-menu-item" data-bind="click: openInTab">
         Open in new tab
@@ -134,9 +134,28 @@
         Remove
         <i class="glyphicon glyphicon-trash pull-right"></i>
       </li>
+      <li class="list-group-item ctx-menu-item" data-bind="click: exportSelectedBookmarks">
+        Export
+      </li>
     </ul>
   </div>
 
+  <div
+  class="ctx-menu"
+  data-bind="visible: showFolderContextMenu, style: {'position':'fixed', 'top': contextMenuPosX, 'left': contextMenuPosY }, clickBubble: false">
+  <ul class="list-group">
+    <li
+      class="list-group-item ctx-menu-item"
+      data-bind="click: confirmDeleteFromCtxMenu">
+      Remove
+      <i class="glyphicon glyphicon-trash pull-right"></i>
+    </li>
+    <li class="list-group-item ctx-menu-item" data-bind="click: exportSelectedBookmarks">
+      Export
+    </li>
+  </ul>
+</div>
+
   <div
     id="import-dialog"
     class="panel panel-primary dialog"