diff --git a/Atom/src/AtomController.h b/Atom/src/AtomController.h
index c5b7ff43d..7dd479aa0 100644
--- a/Atom/src/AtomController.h
+++ b/Atom/src/AtomController.h
@@ -19,6 +19,8 @@ class ClientHandler;
 - (id)initSpecsWithAtomContext:(CefRefPtr<CefV8Context>)atomContext;
 - (id)initBenchmarksWithAtomContext:(CefRefPtr<CefV8Context>)atomContext;
 
+- (CefRefPtr<CefV8Context>)context;
+
 - (void)createBrowser;
 
 @property (nonatomic, retain) IBOutlet NSView *webView;
diff --git a/Atom/src/AtomController.mm b/Atom/src/AtomController.mm
index 16d53d2ab..c34ddefd0 100644
--- a/Atom/src/AtomController.mm
+++ b/Atom/src/AtomController.mm
@@ -60,6 +60,10 @@
   CefBrowser::CreateBrowser(window_info, _clientHandler.get(), [indexURLString UTF8String], settings);  
 }
 
+- (CefRefPtr<CefV8Context>)context {
+  return _clientHandler->GetBrowser()->GetMainFrame()->GetV8Context();
+}
+
 #pragma mark BrowserDelegate
 
 - (void)loadStart {