diff --git a/src/edt/edt/edtServiceImpl.cc b/src/edt/edt/edtServiceImpl.cc
index dc3d2228c..669eb166f 100644
--- a/src/edt/edt/edtServiceImpl.cc
+++ b/src/edt/edt/edtServiceImpl.cc
@@ -40,6 +40,7 @@
 #include "layLayoutViewBase.h"
 
 #if defined(HAVE_QT)
+#  include "layLayoutView.h"
 #  include "layTipDialog.h"
 #  include "layDragDropData.h"
 #endif
@@ -72,6 +73,24 @@ ShapeEditService::configure (const std::string &name, const std::string &value)
   }
 }
   
+void
+ShapeEditService::activated ()
+{
+  edt::Service::activated ();
+
+#if defined(HAVE_QT)
+  if (view () == lay::LayoutView::current ()) {
+    lay::LayerPropertiesConstIterator cl = view ()->current_layer ();
+    if (! cl.is_null () && ! cl->visible (true)) {
+      lay::TipDialog td (QApplication::activeWindow (),
+                         tl::to_string (tr ("You are about to draw on a hidden layer. The result won't be visible.")),
+                         "drawing-on-invisible-layer");
+      td.exec_dialog ();
+    }
+  }
+#endif
+}
+
 void
 ShapeEditService::get_edit_layer ()
 {
@@ -89,15 +108,6 @@ ShapeEditService::get_edit_layer ()
     throw tl::Exception (tl::to_string (tr ("Please select a cell first")));
   }
 
-#if defined(HAVE_QT)
-  if (! cl->visible (true)) {
-    lay::TipDialog td (QApplication::activeWindow (),
-                       tl::to_string (tr ("You are about to draw on a hidden layer. The result won't be visible.")),
-                       "drawing-on-invisible-layer");
-    td.exec_dialog ();
-  }
-#endif
-
   if (layer < 0 || ! cv->layout ().is_valid_layer ((unsigned int) layer)) {
 
     if (cl->has_children ()) {
diff --git a/src/edt/edt/edtServiceImpl.h b/src/edt/edt/edtServiceImpl.h
index e2c31ae5d..1015c993c 100644
--- a/src/edt/edt/edtServiceImpl.h
+++ b/src/edt/edt/edtServiceImpl.h
@@ -62,6 +62,7 @@ protected:
   virtual void tap (const db::DPoint &initial);
 
   virtual bool configure (const std::string &name, const std::string &value);
+  virtual void activated ();
 
 protected:
   std::pair <bool, db::DPoint> interpolate (const db::DPoint &m, const db::DPoint &o, const db::DPoint &p) const;
diff --git a/src/lay/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc
index 51bc51462..061fda5c6 100644
--- a/src/lay/lay/layMainWindow.cc
+++ b/src/lay/lay/layMainWindow.cc
@@ -188,6 +188,8 @@ MainWindow::MainWindow (QApplication *app, const char *name, bool undo_enabled)
       mp_app (app),
       m_manager (undo_enabled)
 {
+  setAnimated (false);
+
   m_dispatcher.set_menu_parent_widget (this);
   m_dispatcher.make_menu ();