diff --git a/src/Viewer/viewmgr.cxx b/src/Viewer/viewmgr.cxx
index 5af533126..6d7035777 100644
--- a/src/Viewer/viewmgr.cxx
+++ b/src/Viewer/viewmgr.cxx
@@ -141,6 +141,16 @@ FGViewMgr::init ()
   do_bind();
 }
 
+void
+FGViewMgr::shutdown()
+{
+    if (!inited) {
+        return;
+    }
+    
+    inited = false;
+}
+
 void
 FGViewMgr::reinit ()
 {
@@ -290,6 +300,8 @@ void
 FGViewMgr::unbind ()
 {
   _tiedProperties.Untie();
+    config_list.clear();
+    view_number.clear();
 }
 
 void
diff --git a/src/Viewer/viewmgr.hxx b/src/Viewer/viewmgr.hxx
index 0a7833ea0..b8711be8c 100644
--- a/src/Viewer/viewmgr.hxx
+++ b/src/Viewer/viewmgr.hxx
@@ -53,7 +53,8 @@ public:
     virtual void unbind ();
     virtual void update (double dt);
     virtual void reinit ();
-
+    virtual void shutdown();
+    
     // getters
     inline int size() const { return views.size(); }
     inline int get_current() const { return current; }