diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index 28f69a0b488..9735ce4528b 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -514,7 +514,7 @@ namespace ts.NavigationBar {
         return {
             text: getItemName(n.node),
             kind: getNodeKind(n.node),
-            kindModifiers: getNodeModifiers(n.node),
+            kindModifiers: getModifiers(n.node),
             spans: getSpans(n),
             childItems: map(n.children, convertToTree)
         };
@@ -524,7 +524,7 @@ namespace ts.NavigationBar {
         return {
             text: getItemName(n.node),
             kind: getNodeKind(n.node),
-            kindModifiers: getNodeModifiers(n.node),
+            kindModifiers: getModifiers(n.node),
             spans: getSpans(n),
             childItems: map(n.children, convertToChildItem) || emptyChildItemArray,
             indent: n.indent,
@@ -594,6 +594,13 @@ namespace ts.NavigationBar {
             : createTextSpanFromNode(node, curSourceFile);
     }
 
+    function getModifiers(node: ts.Node): string {
+        if (node.parent && node.parent.kind === SyntaxKind.VariableDeclaration) {
+            node = node.parent;
+        }
+        return getNodeModifiers(node);
+    }
+
     function getFunctionOrClassName(node: FunctionExpression | FunctionDeclaration | ArrowFunction | ClassLikeDeclaration): string {
         if (node.name && getFullWidth(node.name) > 0) {
             return declarationNameToString(node.name);
diff --git a/tests/cases/fourslash/navigationBarItemsFunctionProperties.ts b/tests/cases/fourslash/navigationBarItemsFunctionProperties.ts
index 75c20736b41..9844f53d879 100644
--- a/tests/cases/fourslash/navigationBarItemsFunctionProperties.ts
+++ b/tests/cases/fourslash/navigationBarItemsFunctionProperties.ts
@@ -6,10 +6,6 @@
 //// .a = function() { };
 //// })();
 
-function navExact(name: string, kind: string) {
-	return;
-}
-
 verify.navigationTree(
 {
   "text": "<global>",
diff --git a/tests/cases/fourslash/navigationBarItemsNamedArrowFunctions.ts b/tests/cases/fourslash/navigationBarItemsNamedArrowFunctions.ts
new file mode 100644
index 00000000000..32abf4092c7
--- /dev/null
+++ b/tests/cases/fourslash/navigationBarItemsNamedArrowFunctions.ts
@@ -0,0 +1,78 @@
+/// <reference path="fourslash.ts" />
+
+////export const value = 2;
+////export const func = () => 2;
+////export const func2 = function() { };
+////export function exportedFunction() { }
+
+verify.navigationBar([
+    {
+        "text": "\"navigationBarItemsNamedArrowFunctions\"",
+        "kind": "module",
+        "childItems": [
+            {
+                "text": "exportedFunction",
+                "kind": "function",
+                "kindModifiers": "export"
+            },
+            {
+                "text": "func",
+                "kind": "function"
+            },
+            {
+                "text": "func2",
+                "kind": "function"
+            },
+            {
+                "text": "value",
+                "kind": "const",
+                "kindModifiers": "export"
+            }
+        ]
+    },
+    {
+        "text": "exportedFunction",
+        "kind": "function",
+        "kindModifiers": "export",
+        "indent": 1
+    },
+    {
+        "text": "func",
+        "kind": "function",
+        "kindModifiers": "export",
+        "indent": 1
+    },
+    {
+        "text": "func2",
+        "kind": "function",
+        "kindModifiers": "export",
+        "indent": 1
+    }
+]);
+
+verify.navigationTree({
+    "text": "\"navigationBarItemsNamedArrowFunctions\"",
+    "kind": "module",
+    "childItems": [
+        {
+            "text": "exportedFunction",
+            "kind": "function",
+            "kindModifiers": "export"
+        },
+        {
+            "text": "func",
+            "kind": "function",
+            "kindModifiers": "export"
+        },
+        {
+            "text": "func2",
+            "kind": "function",
+            "kindModifiers": "export"
+        },
+        {
+            "text": "value",
+            "kind": "const",
+            "kindModifiers": "export"
+        }
+    ]
+});