diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -91,7 +91,7 @@ export default class Base extends EventEmitter {
             backHandler: partialApplyId(screen, "backHandler"),
             badgeLink: "https://auth0.com/?utm_source=lock&utm_campaign=badge&utm_medium=widget",
             closeHandler: l.ui.closable(m)
-              ? partialApplyId(screen, "closeHandler")
+              ? (...args) => closeLock(l.id(m), ...args)
               : undefined,
             contentRender: ::screen.render,
             error: l.globalError(m),
diff --git a/src/lock/screen.js b/src/lock/screen.js
index <HASH>..<HASH> 100644
--- a/src/lock/screen.js
+++ b/src/lock/screen.js
@@ -1,4 +1,3 @@
-import { closeLock } from './actions';
 import * as l from './index';
 
 export default class Screen {
@@ -10,10 +9,6 @@ export default class Screen {
     return null;
   }
 
-  closeHandler() {
-    return closeLock;
-  }
-
   escHandler() {
     return null;
   }
Remove closeHandler method from Screen