diff --git a/src/bundles/ipfs-provider.js b/src/bundles/ipfs-provider.js
index a673f5fed..edf6206b6 100644
--- a/src/bundles/ipfs-provider.js
+++ b/src/bundles/ipfs-provider.js
@@ -169,9 +169,10 @@ const writeSetting = (id, value) => {
 /**
  * @typedef {Object} IPFSAPI
  * @property {(callback?:Function) => Promise<void>} stop
+ * @property {Object} files
+ * @property {(callback?:Function) => Promise<Object>} files.stat
  */
-
-/** @type {IPFSAPI|void} */
+/** @type {IPFSAPI|null} */
 let ipfs = null
 
 /**
@@ -232,6 +233,11 @@ const bundle = {
 
   doDismissIpfsInvalidAddress: () => (store) => {
     store.dispatch({ type: 'IPFS_API_ADDRESS_INVALID_DISMISS' })
+  },
+
+  doGetCidForPath: (path) => async () => {
+    const { cid } = await ipfs.files.stat(path)
+    return cid
   }
 }
 
diff --git a/src/files/FilesPage.js b/src/files/FilesPage.js
index 3f9c40c6d..5e439af52 100644
--- a/src/files/FilesPage.js
+++ b/src/files/FilesPage.js
@@ -225,7 +225,7 @@ class FilesPage extends React.Component {
           translateX={contextMenu.translateX}
           translateY={contextMenu.translateY}
           handleClick={this.handleContextMenu}
-          isUpperDir={contextMenu.file && contextMenu.file.name === '..'}
+          isDirectory={contextMenu.file && contextMenu.file.type === 'directory'}
           isMfs={filesPathInfo ? filesPathInfo.isMfs : false}
           isUnknown={!!(contextMenu.file && contextMenu.file.type === 'unknown')}
           pinned={contextMenu.file && contextMenu.file.pinned}
diff --git a/src/files/breadcrumbs/Breadcrumbs.css b/src/files/breadcrumbs/Breadcrumbs.css
index d8e75060a..dfc8b752e 100644
--- a/src/files/breadcrumbs/Breadcrumbs.css
+++ b/src/files/breadcrumbs/Breadcrumbs.css
@@ -17,3 +17,7 @@
 .BreadcrumbsButton.dragging::after {
     opacity: 1;
 }
+
+.BreadcrumbsButton.no-events {
+    pointer-events: none;
+}
diff --git a/src/files/breadcrumbs/Breadcrumbs.js b/src/files/breadcrumbs/Breadcrumbs.js
index 84db22985..b07cd9c12 100644
--- a/src/files/breadcrumbs/Breadcrumbs.js
+++ b/src/files/breadcrumbs/Breadcrumbs.js
@@ -1,28 +1,30 @@
-import React, { useEffect, useState, useRef } from 'react'
+import React, { useEffect, useState, useRef, useMemo } from 'react'
 import classNames from 'classnames'
 import PropTypes from 'prop-types'
+import { basename, join } from 'path'
+import { connect } from 'redux-bundler-react'
 import { withTranslation } from 'react-i18next'
+import { useDrop } from 'react-dnd'
 import { NativeTypes } from 'react-dnd-html5-backend'
 
-import './Breadcrumbs.css'
-import { useDrop } from 'react-dnd'
-import { basename, join } from 'path'
 import { normalizeFiles } from '../../lib/files'
 
-const DropableBreadcrumb = ({ index, link, path, onAddFiles, onMove, onClick, onContextMenuHandle }) => {
+import './Breadcrumbs.css'
+
+const DropableBreadcrumb = ({ index, link, fullPath, immutable, onAddFiles, onMove, onClick, onContextMenuHandle, getCidForPath }) => {
   const [{ isOver }, drop] = useDrop({
     accept: [NativeTypes.FILE, 'FILE'],
-    drop: ({ files, filesPromise, path: filePath }) => {
+    drop: async ({ files, filesPromise, path: filePath }) => {
       if (files) {
         (async () => {
           const files = await filesPromise
-          onAddFiles(await normalizeFiles(files), path)
+          onAddFiles(await normalizeFiles(files), fullPath)
         })()
       } else {
         const src = filePath
-        const dst = join(path, basename(filePath))
+        const dst = join(link.path, basename(filePath))
 
-        onMove(src, dst)
+        try { await onMove(src, dst) } catch (e) { console.error(e) }
       }
     },
     collect: (monitor) => ({
@@ -32,12 +34,29 @@ const DropableBreadcrumb = ({ index, link, path, onAddFiles, onMove, onClick, on
 
   const buttonRef = useRef()
 
-  const handleOnContextMenuHandle = (ev) => onContextMenuHandle(ev, buttonRef.current)
+  const handleOnContextMenuHandle = async (ev) => {
+    ev.preventDefault()
+
+    const { path } = link
+    const sanitizedPath = path.substring(path.indexOf('/', 1), path.length)
+    const cid = await getCidForPath(sanitizedPath)
+
+    onContextMenuHandle(undefined, buttonRef.current, {
+      ...link,
+      ...(!link.last && { type: 'directory' }),
+      cid
+    })
+  }
 
   return (
     <span className='dib pv1 pr1' ref={drop}>
       <button ref={buttonRef} title={link.realName}
-        className={classNames('BreadcrumbsButton relative', index !== 0 && 'navy', index === 0 && 'f7 pointer pa1 bg-navy br2 mr2 white', link.last && 'b', isOver && 'dragging')}
+        className={classNames('BreadcrumbsButton relative',
+          index !== 0 && 'navy',
+          index === 0 && 'f7 pa1 br2 mr2',
+          index === 0 && (immutable ? 'bg-charcoal-muted white' : 'bg-navy white'),
+          immutable && (link.last || index === 0) && 'no-events',
+          link.last && 'b', isOver && 'dragging')}
         onClick={() => onClick(link.path)} onContextMenu={(ev) => index !== 0 && handleOnContextMenuHandle(ev)}>
         {link.name}
       </button>
@@ -45,8 +64,9 @@ const DropableBreadcrumb = ({ index, link, path, onAddFiles, onMove, onClick, on
   )
 }
 
-const Breadcrumbs = ({ t, tReady, path, onClick, className, onContextMenuHandle, onAddFiles, onMove, ...props }) => {
+const Breadcrumbs = ({ t, tReady, path, onClick, className, onContextMenuHandle, onAddFiles, onMove, doGetCidForPath, ...props }) => {
   const [overflows, setOverflows] = useState(false)
+  const [isImmutable, setImmutable] = useState(false)
   const anchors = useRef()
 
   useEffect(() => {
@@ -58,21 +78,22 @@ const Breadcrumbs = ({ t, tReady, path, onClick, className, onContextMenuHandle,
     }
   }, [overflows])
 
-  const bread = makeBread(path, t)
+  const bread = useMemo(() =>
+    makeBread(path, t, isImmutable, setImmutable)
+  , [isImmutable, path, t])
 
   return (
-    <nav aria-label={t('breadcrumbs')} className={classNames('Breadcrumbs flex items-center sans-serif overflow-hidden', className)} {...props}>
+    <nav aria-label={t('breadcrumbs')} className={classNames('Breadcrumbs flex items-center sans-serif overflow-hidden sticky top-0', className)} {...props}>
       <div className='nowrap overflow-hidden relative flex flex-wrap' ref={ anchors }>
         <div className={`absolute left-0 top-0 h-100 w1 ${overflows ? '' : 'dn'}`} style={{ background: 'linear-gradient(to right, #ffffff 0%, transparent 100%)' }} />
 
         { bread.map((link, index) => (
           <div key={`${index}link`}>
-            <DropableBreadcrumb index={index} link={link} path={path}
-              onAddFiles={onAddFiles} onMove={onMove} onClick={onClick} onContextMenuHandle={onContextMenuHandle} />
-            <span className='dib pr1 pv1 mid-gray v-top'>/</span>
+            <DropableBreadcrumb index={index} link={link} fullPath={path} immutable={isImmutable}
+              onAddFiles={onAddFiles} onMove={onMove} onClick={onClick} onContextMenuHandle={onContextMenuHandle} getCidForPath={doGetCidForPath} />
+            { index !== bread.length - 1 && <span className='dib pr1 pv1 mid-gray v-top'>/</span>}
           </div>
-        )
-        )}
+        ))}
 
       </div>
     </nav>
@@ -86,17 +107,15 @@ Breadcrumbs.propTypes = {
   onContextMenuHandle: PropTypes.func
 }
 
-function makeBread (root, t) {
+function makeBread (root, t, isImmutable, setImmutable) {
   if (root.endsWith('/')) {
     root = root.substring(0, root.length - 1)
   }
 
-  const parts = root.split('/').map(part => {
-    return {
-      name: part,
-      path: part
-    }
-  })
+  const parts = root.split('/').map(part => ({
+    name: part,
+    path: part
+  }))
 
   for (let i = 1; i < parts.length; i++) {
     const name = parts[i].name
@@ -113,10 +132,18 @@ function makeBread (root, t) {
   }
 
   parts.shift()
+
+  if (parts[0].name === 'ipfs' || parts[0].name === 'ipns') {
+    !isImmutable && setImmutable(true)
+  }
+
   parts[0].name = t(parts[0].name)
 
   parts[parts.length - 1].last = true
   return parts
 }
 
-export default withTranslation('files')(Breadcrumbs)
+export default connect(
+  'doGetCidForPath',
+  withTranslation('files')(Breadcrumbs)
+)
diff --git a/src/files/context-menu/ContextMenu.js b/src/files/context-menu/ContextMenu.js
index e3bf67295..f7131ba74 100644
--- a/src/files/context-menu/ContextMenu.js
+++ b/src/files/context-menu/ContextMenu.js
@@ -45,7 +45,7 @@ class ContextMenu extends React.Component {
     const {
       t, onRename, onDelete, onDownload, onInspect, onShare,
       translateX, translateY, className,
-      isUpperDir, isMfs, isUnknown, pinned, isCliTutorModeEnabled
+      isDirectory, isMfs, isUnknown, pinned, isCliTutorModeEnabled
     } = this.props
     return (
       <Dropdown className={className}>
@@ -58,7 +58,7 @@ class ContextMenu extends React.Component {
           translateY={-translateY}
           open={this.props.isOpen}
           onDismiss={this.props.handleClick}>
-          { !isUpperDir && onShare &&
+          { !isDirectory && onShare &&
             <Option onClick={this.wrap('onShare')}>
               <StrokeShare className='w2 mr2 fill-aqua' />
               {t('actions.share')}
@@ -81,21 +81,21 @@ class ContextMenu extends React.Component {
             <StrokePin className='w2 mr2 fill-aqua' />
             { pinned ? t('actions.unpin') : t('actions.pin') }
           </Option>
-          { !isUpperDir && !isUnknown && onDownload &&
+          { !isDirectory && !isUnknown && onDownload &&
             <Option onClick={this.wrap('onDownload')} isCliTutorModeEnabled={isCliTutorModeEnabled}
               onCliTutorMode={this.wrap('onCliTutorMode', cliCmdKeys.DOWNLOAD_OBJECT_COMMAND)}>
               <StrokeDownload className='w2 mr2 fill-aqua' />
               {t('actions.download')}
             </Option>
           }
-          { !isUpperDir && !isUnknown && isMfs && onRename &&
+          { !isDirectory && !isUnknown && isMfs && onRename &&
             <Option onClick={this.wrap('onRename')} isCliTutorModeEnabled={isCliTutorModeEnabled}
               onCliTutorMode={this.wrap('onCliTutorMode', cliCmdKeys.RENAME_IPFS_OBJECT)}>
               <StrokePencil className='w2 mr2 fill-aqua' />
               {t('actions.rename')}
             </Option>
           }
-          { !isUpperDir && !isUnknown && isMfs && onDelete &&
+          { !isDirectory && !isUnknown && isMfs && onDelete &&
             <Option onClick={this.wrap('onDelete')} isCliTutorModeEnabled={isCliTutorModeEnabled}
               onCliTutorMode={this.wrap('onCliTutorMode', cliCmdKeys.DELETE_FILE_FROM_IPFS)}
             >
@@ -114,7 +114,7 @@ ContextMenu.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   isUnknown: PropTypes.bool.isRequired,
   hash: PropTypes.string,
-  isUpperDir: PropTypes.bool,
+  isDirectory: PropTypes.bool,
   pinned: PropTypes.bool,
   handleClick: PropTypes.func,
   translateX: PropTypes.number.isRequired,
@@ -134,7 +134,7 @@ ContextMenu.propTypes = {
 ContextMenu.defaultProps = {
   isMfs: false,
   isOpen: false,
-  isUpperDir: false,
+  isDirectory: false,
   isUnknown: false,
   top: 0,
   left: 0,
diff --git a/src/files/context-menu/ContextMenu.stories.js b/src/files/context-menu/ContextMenu.stories.js
index be9932cb4..818d11d89 100644
--- a/src/files/context-menu/ContextMenu.stories.js
+++ b/src/files/context-menu/ContextMenu.stories.js
@@ -15,7 +15,6 @@ storiesOf('Files', module)
       <ContextMenu
         isOpen={boolean('isOpen', false)}
         isMfs={boolean('isMfs', false)}
-        isUpperDir={boolean('isUpperDir', false)}
         pinned={boolean('pinned', false)}
         top={10}
         left={10}
diff --git a/src/files/files-list/FilesList.js b/src/files/files-list/FilesList.js
index 3a835f927..abaa5d321 100644
--- a/src/files/files-list/FilesList.js
+++ b/src/files/files-list/FilesList.js
@@ -27,7 +27,6 @@ export class FilesList extends React.Component {
   static propTypes = {
     className: PropTypes.string,
     files: PropTypes.array.isRequired,
-    upperDir: PropTypes.object,
     filesSorting: PropTypes.shape({
       by: PropTypes.string.isRequired,
       asc: PropTypes.bool.isRequired
@@ -75,10 +74,6 @@ export class FilesList extends React.Component {
   }
 
   get focusedFile () {
-    if (this.state.focused === '..') {
-      return this.props.upperDir
-    }
-
     return this.props.files.find(el => el.name === this.state.focused)
   }
 
@@ -133,7 +128,7 @@ export class FilesList extends React.Component {
   }
 
   keyHandler = (e) => {
-    const { files, upperDir, filesIsFetching } = this.props
+    const { files, filesIsFetching } = this.props
     const { selected, focused, firstVisibleRow } = this.state
 
     // Disable keyboard controls if fetching files
@@ -146,7 +141,7 @@ export class FilesList extends React.Component {
       return this.listRef.current.forceUpdateGrid()
     }
 
-    if (e.key === 'F2' && focused !== null && focused !== '..') {
+    if (e.key === 'F2' && focused !== null) {
       return this.props.onRename([this.focusedFile])
     }
 
@@ -154,7 +149,7 @@ export class FilesList extends React.Component {
       return this.props.onDelete(this.selectedFiles)
     }
 
-    if (e.key === ' ' && focused !== null && focused !== '..') {
+    if (e.key === ' ' && focused !== null) {
       e.preventDefault()
       return this.toggleOne(focused, true)
     }
@@ -165,25 +160,19 @@ export class FilesList extends React.Component {
 
     if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
       e.preventDefault()
-      let index = upperDir ? -1 : 0
+      let index = 0
 
       if (focused !== null) {
         const prev = files.findIndex(el => el.name === focused)
         index = (e.key === 'ArrowDown') ? prev + 1 : prev - 1
       }
 
-      if (index === -1 && !upperDir) {
+      if (index === -1) {
         return
       }
 
-      if (index >= -1 && index < files.length) {
-        let name
-
-        if (index === -1) {
-          name = '..'
-        } else {
-          name = files[index].name
-        }
+      if (index < files.length) {
+        let name = files[index].name
 
         // If the file we are going to focus is out of view (removed
         // from the DOM by react-virtualized), focus the first visible file
@@ -280,63 +269,21 @@ export class FilesList extends React.Component {
   }
 
   emptyRowsRenderer = () => {
-    const { t, upperDir, isOver, canDrop, onNavigate, onAddFiles } = this.props
-    const { isDragging, focused } = this.state
+    const { t } = this.props
 
     return (
-      <Fragment>
-        { upperDir && <div ref={r => { this.filesRefs['..'] = r }}>
-          <File
-            onNavigate={() => onNavigate(upperDir.path)}
-            onAddFiles={onAddFiles}
-            onMove={this.move}
-            setIsDragging={this.isDragging}
-            handleContextMenuClick={this.props.handleContextMenuClick}
-            translucent={isDragging || (isOver && canDrop)}
-            name='..'
-            focused={focused === '..'}
-            cantDrag
-            cantSelect
-            {...upperDir} />
-        </div> }
-
-        <Trans i18nKey='filesList.noFiles' t={t}>
-          <div className='pv3 b--light-gray bt tc gray f6'>
+      <Trans i18nKey='filesList.noFiles' t={t}>
+        <div className='pv3 b--light-gray bt tc gray f6'>
             There are no available files. Add some!
-          </div>
-        </Trans>
-      </Fragment>
+        </div>
+      </Trans>
     )
   }
 
   rowRenderer = ({ index, key, style }) => {
-    const { files, pins, upperDir, filesPathInfo, isOver, canDrop, onNavigate, onInspect, onAddFiles } = this.props
+    const { files, pins, filesPathInfo, isOver, canDrop, onNavigate, onInspect, onAddFiles } = this.props
     const { selected, focused, isDragging } = this.state
 
-    if (upperDir) {
-      // We want the `upperDir` to be the first item on the list
-      if (index === 0) {
-        return (
-          <div key={key} style={style} ref={r => { this.filesRefs[upperDir.name] = r }}>
-            <File
-              onNavigate={() => onNavigate(upperDir.path)}
-              onAddFiles={onAddFiles}
-              onMove={this.move}
-              setIsDragging={this.isDragging}
-              handleContextMenuClick={this.props.handleContextMenuClick}
-              isMfs={filesPathInfo.isMfs}
-              translucent={isDragging || (isOver && canDrop)}
-              focused={focused === upperDir.name}
-              cantDrag
-              cantSelect
-              {...upperDir} />
-          </div>
-        )
-      }
-      // Decrease the index to stay inside the `files` array range
-      index--
-    }
-
     return (
       <div key={key} style={style} ref={r => { this.filesRefs[files[index].name] = r }}>
         <File
@@ -366,10 +313,10 @@ export class FilesList extends React.Component {
   onRowsRendered = ({ startIndex }) => this.setState({ firstVisibleRow: startIndex })
 
   render () {
-    let { t, files, className, upperDir, showLoadingAnimation, connectDropTarget } = this.props
+    let { t, files, className, showLoadingAnimation, connectDropTarget } = this.props
     const { selected } = this.state
     const allSelected = selected.length !== 0 && selected.length === files.length
-    const rowCount = files.length && upperDir ? files.length + 1 : files.length
+    const rowCount = files.length
     const checkBoxCls = classnames({
       'o-1': allSelected,
       'o-70': !allSelected
diff --git a/src/files/header/Header.js b/src/files/header/Header.js
index 999622d47..2fbd44c2e 100644
--- a/src/files/header/Header.js
+++ b/src/files/header/Header.js
@@ -40,11 +40,9 @@ class Header extends React.Component {
     }, pos)
   }
 
-  handleBreadCrumbsContextMenu = (ev, breadcrumbsRef) => {
+  handleBreadCrumbsContextMenu = (ev, breadcrumbsRef, file) => {
     const pos = breadcrumbsRef.getBoundingClientRect()
-    this.props.handleContextMenu(ev, 'RIGHT', {
-      ...this.props.files
-    }, pos)
+    this.props.handleContextMenu(ev, 'TOP', file, pos)
   }
 
   render () {
@@ -63,7 +61,7 @@ class Header extends React.Component {
       <div className='db flex-l justify-between items-center'>
         <div className='mb3 overflow-hidden mr2'>
           <Breadcrumbs className="joyride-files-breadcrumbs" path={files ? files.path : '/404'}
-            onClick={onNavigate} onContextMenuHandle={(ev, ref) => this.handleBreadCrumbsContextMenu(ev, ref)}
+            onClick={onNavigate} onContextMenuHandle={(...args) => this.handleBreadCrumbsContextMenu(...args)}
             onAddFiles={this.props.onAddFiles} onMove={this.props.onMove}/>
         </div>