diff --git a/corona.cpp b/corona.cpp
index b0b1a5f92..80b1bb3b1 100644
--- a/corona.cpp
+++ b/corona.cpp
@@ -192,6 +192,11 @@ Corona::~Corona()
     // also checks kiosk and parent containers
     cg.writeEntry("immutability", (int)d->immutability);
     delete d;
+
+    // FIXME: Same fix as in Plasma::View - make sure that when the focused widget is
+    //        destroyed we don't try to transfer it to something that's already been
+    //        deleted.
+    clearFocus();
 }
 
 void Corona::setAppletMimeType(const QString& type)
diff --git a/view.cpp b/view.cpp
index ff60ce7d3..55b72c1b2 100644
--- a/view.cpp
+++ b/view.cpp
@@ -129,6 +129,7 @@ View::~View()
 {
     delete d;
     // FIXME FIX a focus crash but i wasn't able to reproduce in a simple test case for Qt guys
+    //       NB: this is also done in Corona
     clearFocus();
 }