diff --git a/browser/api/atom_api_window.cc b/browser/api/atom_api_window.cc
index 10b9ca0968f6..af6df1b185a8 100644
--- a/browser/api/atom_api_window.cc
+++ b/browser/api/atom_api_window.cc
@@ -71,6 +71,14 @@ void Window::OnWindowBlur() {
   Emit("blur");
 }
 
+void Window::OnRendererUnresponsive() {
+  Emit("unresponsive");
+}
+
+void Window::OnRendererResponsive() {
+  Emit("responsive");
+}
+
 // static
 v8::Handle<v8::Value> Window::New(const v8::Arguments &args) {
   v8::HandleScope scope;
diff --git a/browser/api/atom_api_window.h b/browser/api/atom_api_window.h
index ab318ea38e6d..6b49b2212c7b 100644
--- a/browser/api/atom_api_window.h
+++ b/browser/api/atom_api_window.h
@@ -38,6 +38,8 @@ class Window : public EventEmitter,
   virtual void WillCloseWindow(bool* prevent_default) OVERRIDE;
   virtual void OnWindowClosed() OVERRIDE;
   virtual void OnWindowBlur() OVERRIDE;
+  virtual void OnRendererUnresponsive() OVERRIDE;
+  virtual void OnRendererResponsive() OVERRIDE;
 
  private:
   static v8::Handle<v8::Value> New(const v8::Arguments &args);
diff --git a/browser/default_app/index.html b/browser/default_app/index.html
index f227e99fb8a2..86e5055970af 100644
--- a/browser/default_app/index.html
+++ b/browser/default_app/index.html
@@ -7,9 +7,11 @@
   This is the default mode of Atom Shell, please follow the instructions in
   wiki to get started.
   <script type="text/javascript" charset="utf-8">
+
     var ipc = require('ipc');
 
     window.addEventListener('contextmenu', function (e) {
+      while(1) {}
       e.preventDefault();
       ipc.send('menu');
     }, false);
diff --git a/browser/default_app/main.js b/browser/default_app/main.js
index 7bef852e78fc..246dd660ab23 100644
--- a/browser/default_app/main.js
+++ b/browser/default_app/main.js
@@ -30,6 +30,10 @@ delegate.browserMainParts.preMainMessageLoopRun = function() {
     mainWindow = null;
   });
 
+  mainWindow.on('unresponsive', function() {
+    console.log('unresponsive');
+  });
+
   var template = [
     {
       label: 'Atom Shell',
diff --git a/browser/native_window.cc b/browser/native_window.cc
index 6f402d79b039..ac0f48bb8c02 100644
--- a/browser/native_window.cc
+++ b/browser/native_window.cc
@@ -248,6 +248,14 @@ bool NativeWindow::IsPopupOrPanel(const content::WebContents* source) const {
   return true;
 }
 
+void NativeWindow::RendererUnresponsive(content::WebContents* source) {
+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererUnresponsive());
+}
+
+void NativeWindow::RendererResponsive(content::WebContents* source) {
+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnRendererResponsive());
+}
+
 bool NativeWindow::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NativeWindow, message)
diff --git a/browser/native_window.h b/browser/native_window.h
index 41db89680c42..8292da858bda 100644
--- a/browser/native_window.h
+++ b/browser/native_window.h
@@ -146,6 +146,8 @@ class NativeWindow : public content::WebContentsDelegate,
   virtual void CloseContents(content::WebContents* source) OVERRIDE;
   virtual bool IsPopupOrPanel(
       const content::WebContents* source) const OVERRIDE;
+  virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
+  virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
 
   // Implementations of content::WebContentsObserver.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
diff --git a/browser/native_window_observer.h b/browser/native_window_observer.h
index e5bb04716225..dc274b0066fb 100644
--- a/browser/native_window_observer.h
+++ b/browser/native_window_observer.h
@@ -25,6 +25,12 @@ class NativeWindowObserver {
 
   // Called when window loses focus.
   virtual void OnWindowBlur() {}
+
+  // Called when renderer is hung.
+  virtual void OnRendererUnresponsive() {}
+
+  // Called when renderer recovers.
+  virtual void OnRendererResponsive() {}
 };
 
 }  // namespace atom