diff --git a/src/gui/panels/panel.cpp b/src/gui/panels/panel.cpp
index 962c4f8b3..b088e773f 100644
--- a/src/gui/panels/panel.cpp
+++ b/src/gui/panels/panel.cpp
@@ -54,9 +54,9 @@ Panel::Panel(workspace::PanelManager &panel_manager,
   gdl_dock_item_grip_set_label(grip, ((Widget&)panelBar).gobj());
     
   // Set up the panel body
-  gtk_container_add ((GtkContainer*)dockItem, (GtkWidget*)gobj());
+  gtk_container_add (GTK_CONTAINER(dockItem), GTK_WIDGET(gobj()));
   
-  gtk_widget_show ((GtkWidget*)dockItem);
+  gtk_widget_show (GTK_WIDGET(dockItem));
   
   // Connect the signals
 	hide_panel_handler_id = g_signal_connect (GTK_OBJECT(dockItem),
@@ -73,6 +73,8 @@ Panel::~Panel()
   gtk_container_remove (GTK_CONTAINER(grip),
     ((Widget&)panelBar).gobj());
     
+  gtk_container_remove (GTK_CONTAINER(dockItem), GTK_WIDGET(gobj()));
+    
   // Detach the signals
   g_signal_handler_disconnect(
     GTK_OBJECT(dockItem), hide_panel_handler_id);