diff --git a/src/services/services.ts b/src/services/services.ts
index 6d58b18ad3..e2089e0ade 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2680,6 +2680,11 @@ module ts {
                         return getConstructorOccurrences(<ConstructorDeclaration>node.parent);
                     }
                     break;
+                case SyntaxKind.GetKeyword:
+                case SyntaxKind.SetKeyword:
+                    if (hasKind(node.parent, SyntaxKind.GetAccessor) || hasKind(node.parent, SyntaxKind.SetAccessor)) {
+                        return getGetAndSetOccurrences(<AccessorDeclaration>node.parent);
+                    }
             }
 
             return undefined;
@@ -3010,6 +3015,23 @@ module ts {
                 return map(keywords, getReferenceEntryFromNode);
             }
 
+            function getGetAndSetOccurrences(accessorDeclaration: AccessorDeclaration): ReferenceEntry[] {
+                var keywords: Node[] = [];
+
+                tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.GetAccessor);
+                tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.SetAccessor);
+
+                return map(keywords, getReferenceEntryFromNode);
+
+                function tryPushAccessorKeyword(accessorSymbol: Symbol, accessorKind: SyntaxKind): void {
+                    var accessor = getDeclarationOfKind(accessorSymbol, accessorKind);
+
+                    if (accessor) {
+                        forEach(accessor.getChildren(), child => pushKeywordIf(keywords, child, SyntaxKind.GetKeyword, SyntaxKind.SetKeyword));
+                    }
+                }
+            }
+
             // returns true if 'node' is defined and has a matching 'kind'.
             function hasKind(node: Node, kind: SyntaxKind) {
                 return node !== undefined && node.kind === kind;
diff --git a/tests/cases/fourslash/getOccurrencesSetAndGet.ts b/tests/cases/fourslash/getOccurrencesSetAndGet.ts
new file mode 100644
index 0000000000..b1ab6f44c6
--- /dev/null
+++ b/tests/cases/fourslash/getOccurrencesSetAndGet.ts
@@ -0,0 +1,34 @@
+/// <reference path="fourslash.ts" />
+
+////class Foo {
+////    [|set|] bar(b: any) {
+////    }
+////
+////    public [|get|] bar(): any {
+////        return undefined;
+////    }
+////
+////    public set set(s: any) {
+////    }
+////
+////    public get set(): any {
+////        return undefined;
+////    }
+////
+////    public set get(g: any) {
+////    }
+////
+////    public get get(): any {
+////        return undefined;
+////    }
+////}
+
+test.ranges().forEach(r => {
+    goTo.position(r.start);
+
+    test.ranges().forEach(range => {
+        verify.occurrencesAtPositionContains(range, false);
+    });
+
+    verify.occurrencesAtPositionCount(test.ranges().length);
+});
diff --git a/tests/cases/fourslash/getOccurrencesSetAndGet2.ts b/tests/cases/fourslash/getOccurrencesSetAndGet2.ts
new file mode 100644
index 0000000000..1345394b8e
--- /dev/null
+++ b/tests/cases/fourslash/getOccurrencesSetAndGet2.ts
@@ -0,0 +1,34 @@
+/// <reference path="fourslash.ts" />
+
+////class Foo {
+////    set bar(b: any) {
+////    }
+////
+////    public get bar(): any {
+////        return undefined;
+////    }
+////
+////    public [|set|] set(s: any) {
+////    }
+////
+////    public [|get|] set(): any {
+////        return undefined;
+////    }
+////
+////    public set get(g: any) {
+////    }
+////
+////    public get get(): any {
+////        return undefined;
+////    }
+////}
+
+test.ranges().forEach(r => {
+    goTo.position(r.start);
+
+    test.ranges().forEach(range => {
+        verify.occurrencesAtPositionContains(range, false);
+    });
+
+    verify.occurrencesAtPositionCount(test.ranges().length);
+});
diff --git a/tests/cases/fourslash/getOccurrencesSetAndGet3.ts b/tests/cases/fourslash/getOccurrencesSetAndGet3.ts
new file mode 100644
index 0000000000..4105a40757
--- /dev/null
+++ b/tests/cases/fourslash/getOccurrencesSetAndGet3.ts
@@ -0,0 +1,34 @@
+/// <reference path="fourslash.ts" />
+
+////class Foo {
+////    set bar(b: any) {
+////    }
+////
+////    public get bar(): any {
+////        return undefined;
+////    }
+////
+////    public set set(s: any) {
+////    }
+////
+////    public get set(): any {
+////        return undefined;
+////    }
+////
+////    public [|set|] get(g: any) {
+////    }
+////
+////    public [|get|] get(): any {
+////        return undefined;
+////    }
+////}
+
+test.ranges().forEach(r => {
+    goTo.position(r.start);
+
+    test.ranges().forEach(range => {
+        verify.occurrencesAtPositionContains(range, false);
+    });
+
+    verify.occurrencesAtPositionCount(test.ranges().length);
+});