css/edit.css |    5 ++++-
 edit.info    |    1 -
 edit.module  |    4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/css/edit.css b/css/edit.css
index 1108cda..65c7f38 100644
--- a/css/edit.css
+++ b/css/edit.css
@@ -87,7 +87,10 @@
 .toolbar .icon-edit.edit-nothing-editable-hidden {
   display: none;
 }
-
+/* In-place editing doesn't work in the overlay, so always hide the tab. */
+.overlay-open .toolbar .icon-edit {
+  display: none;
+}
 
 
 
diff --git a/edit.info b/edit.info
index 3328601..5298534 100644
--- a/edit.info
+++ b/edit.info
@@ -4,4 +4,3 @@ package = Core
 core = 8.x
 
 dependencies[] = field
-dependencies[] = toolbar
diff --git a/edit.module b/edit.module
index 5159384..ecb498e 100644
--- a/edit.module
+++ b/edit.module
@@ -40,10 +40,6 @@ function edit_permission() {
  * Implements hook_toolbar().
  */
 function edit_toolbar() {
-  if (path_is_admin(current_path())) {
-    return;
-  }
-
   $tab['edit'] = array(
     'tab' => array(
       'title' => t('Edit'),