diff --git a/src/libkstapp/scalardialog.cpp b/src/libkstapp/scalardialog.cpp
@@ -345,6 +345,8 @@ ObjectPtr ScalarDialog::createNewGeneratedScalar(){
 
   _dataObjectName = scalar->Name();
 
+  //UpdateServer::self()->requestUpdateSignal();
+
   return static_cast<ObjectPtr>(scalar);
 }
 
@@ -375,6 +377,8 @@ ObjectPtr ScalarDialog::createNewDataScalar() {
 
   _dataObjectName = scalar->Name();
 
+  //UpdateServer::self()->requestUpdateSignal();
+
   return scalar;
 }
 
@@ -406,6 +410,8 @@ ObjectPtr ScalarDialog::createNewVScalar() {
 
   _dataObjectName = scalar->Name();
 
+  //UpdateServer::self()->requestUpdateSignal();
+
   return scalar;
 }
 

diff --git a/src/libkstapp/scriptserver.cpp b/src/libkstapp/scriptserver.cpp
@@ -17,6 +17,7 @@
 #include "viewitemscriptinterface.h"
 
 #include "sessionmodel.h"
+#include "updateserver.h"
 #include "datagui.h"
 
 //viewitems
@@ -613,6 +614,7 @@ QByteArray ScriptServer::newEditableVectorAndGetHandle(QByteArray&, QLocalSocket
     objectPtr->setDescriptiveName("Script Vector");
     objectPtr->unlock();
     UpdateManager::self()->doUpdates(1);
+    UpdateServer::self()->requestUpdateSignal();
     return handleResponse("Finished editing "+objectPtr->Name().toLatin1(),s,ifMode,ifEqual,_if,var);
 }
 
@@ -663,6 +665,7 @@ QByteArray ScriptServer::newEditableMatrixAndGetHandle(QByteArray&, QLocalSocket
     objectPtr->setDescriptiveName("Script Matrix");
     objectPtr->unlock();
     UpdateManager::self()->doUpdates(1);
+    UpdateServer::self()->requestUpdateSignal();
     return handleResponse("Finished editing "+objectPtr->Name().toLatin1(),s,ifMode,ifEqual,_if,var);
 }
 
@@ -1065,7 +1068,8 @@ QByteArray ScriptServer::eliminate(QByteArray&command, QLocalSocket* s,ObjectSto
             Data::self()->removeCurveFromPlots(relation);
         }
         _store->removeObject(o);
-        kstApp->mainWindow()->document()->session()->triggerReset();
+        UpdateServer::self()->requestUpdateSignal();
+
         return handleResponse("It died a peaceful death.",s,ifMode,ifEqual,_if,var);
     }
 }

diff --git a/src/libkstapp/sessionmodel.cpp b/src/libkstapp/sessionmodel.cpp
@@ -11,6 +11,7 @@
  ***************************************************************************/
 
 #include "sessionmodel.h"
+#include "updateserver.h"
 
 #include <assert.h>
 #include <objectstore.h>
@@ -28,6 +29,8 @@ namespace Kst {
 SessionModel::SessionModel(ObjectStore *store)
 : QAbstractItemModel(), _store(store) {
   generateObjectList();
+
+  connect(UpdateServer::self(), SIGNAL(objectListsChanged()), this, SLOT(triggerReset()));
 }
 
 

diff --git a/src/libkstapp/sessionmodel.h b/src/libkstapp/sessionmodel.h
@@ -25,6 +25,8 @@ class ObjectStore;
 
 class SessionModel : public QAbstractItemModel
 {
+    Q_OBJECT
+
 public:
   SessionModel(ObjectStore *store);
   ~SessionModel();
@@ -36,8 +38,11 @@ class SessionModel : public QAbstractItemModel
   QModelIndex parent(const QModelIndex& index) const;
   QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
   void generateObjectList();
-  void triggerReset();
   ObjectList<Object> *objectList() {return &_objectList;}
+
+public Q_SLOTS:
+  void triggerReset();
+
 private:
   QVariant dataObjectOutputData(DataObjectPtr parent, const QModelIndex& index) const;
   QVariant primitiveData(PrimitivePtr parent, const QModelIndex& index) const;

diff --git a/src/libkstapp/stringdialog.cpp b/src/libkstapp/stringdialog.cpp
@@ -281,6 +281,8 @@ ObjectPtr StringDialog::createNewGeneratedString(){
 
   _dataObjectName = string->Name();
 
+  //UpdateServer::self()->requestUpdateSignal();
+
   return static_cast<ObjectPtr>(string);
 }
 
@@ -311,6 +313,8 @@ ObjectPtr StringDialog::createNewDataString() {
 
   _dataObjectName = string->Name();
 
+  //UpdateServer::self()->requestUpdateSignal();
+
   return string;
 }
 

diff --git a/src/libkstapp/stringscriptinterface.h b/src/libkstapp/stringscriptinterface.h
@@ -21,6 +21,7 @@
 #include "scriptinterface.h"
 #include "string_kst.h"
 #include "updatemanager.h"
+#include "updateserver.h"
 typedef QList<QByteArray> QByteArrayList;
 
 namespace Kst {
@@ -35,7 +36,7 @@ class StringGenSI : public ScriptInterface
     QString doCommand(QString);
     bool isValid();
     QByteArray getHandle();
-    void endEditUpdate() { UpdateManager::self()->doUpdates(true); }
+    void endEditUpdate() { UpdateManager::self()->doUpdates(true); UpdateServer::self()->requestUpdateSignal();}
 };
 
 }

diff --git a/src/libkstapp/vectordialog.cpp b/src/libkstapp/vectordialog.cpp
@@ -491,6 +491,7 @@ ObjectPtr VectorDialog::createNewDataVector() {
 
   _dataObjectName = vector->Name();
 
+  //UpdateServer::self()->requestUpdateSignal();
   return vector;
 }
 
@@ -514,6 +515,7 @@ ObjectPtr VectorDialog::createNewGeneratedVector() {
 
   _dataObjectName = vector->Name();
 
+  //UpdateServer::self()->requestUpdateSignal();
   return vector;
 }
 

diff --git a/src/libkstapp/viewvectordialog.cpp b/src/libkstapp/viewvectordialog.cpp
@@ -15,6 +15,7 @@
 #include "document.h"
 #include "vectormodel.h"
 #include "editmultiplewidget.h"
+#include "updateserver.h"
 
 #include <datacollection.h>
 #include <objectstore.h>
@@ -85,7 +86,8 @@ ViewVectorDialog::ViewVectorDialog(QWidget *parent, Document *doc)
   connect(_showVectorList, SIGNAL(clicked()), this, SLOT(showVectorList()));
   connect(_hideVectorList, SIGNAL(clicked()), this, SLOT(hideVectorList()));
 
-//  setAttribute(Qt::WA_DeleteOnClose);
+  connect(UpdateServer::self(), SIGNAL(objectListsChanged()), this, SLOT(update()));
+
 }
 
 
@@ -96,16 +98,6 @@ ViewVectorDialog::~ViewVectorDialog() {
   delete _removeButton;
 }
 
-
-bool ViewVectorDialog::event(QEvent * event) {
-  if ((event->type() == QEvent::WindowActivate) || (event->type() == QEvent::Resize)) {
-    update();
-  }
-  return QWidget::event(event);
-}
-
-
-
 void ViewVectorDialog::show() {
   // vectorSelected();
   QDialog::show();

diff --git a/src/libkstapp/viewvectordialog.h b/src/libkstapp/viewvectordialog.h
@@ -33,7 +33,6 @@ class ViewVectorDialog : public QDialog, Ui::ViewVectorDialog
     virtual ~ViewVectorDialog();
 
     virtual void show();
-    virtual bool event(QEvent * event);
 
 public Q_SLOTS:
   void contextMenu(const QPoint& position);

diff --git a/src/widgets/vectorselector.cpp b/src/widgets/vectorselector.cpp
@@ -17,6 +17,7 @@
 #include "objectstore.h"
 #include "dialogdefaults.h"
 #include "curve.h"
+#include "updateserver.h"
 
 namespace Kst {
 
@@ -39,6 +40,7 @@ VectorSelector::VectorSelector(QWidget *parent, ObjectStore *store)
   connect(_editVector, SIGNAL(pressed()), this, SLOT(editVector()));
   connect(_vector, SIGNAL(activated(int)), this, SLOT(emitSelectionChanged()));
   connect(_vector, SIGNAL(currentIndexChanged(int)), this, SLOT(updateDescriptionTip()));
+  connect(UpdateServer::self(), SIGNAL(objectListsChanged()), this, SLOT(fillVectors()));
 }
 
 
@@ -240,7 +242,7 @@ void VectorSelector::fillVectors() {
 
 bool VectorSelector::event(QEvent * event) {
   if ((event->type() == QEvent::WindowActivate) || (event->type() == QEvent::Resize)) {
-    fillVectors();
+    //fillVectors();
   }
   return QWidget::event(event);
 }

diff --git a/src/widgets/vectorselector.h b/src/widgets/vectorselector.h
@@ -42,14 +42,16 @@ class KSTWIDGETS_EXPORT VectorSelector : public QWidget, public Ui::VectorSelect
 
     void clearSelection();
 
-    void fillVectors();
     void setToLastX(QString field = QString());
 
     void setIsX(bool is_x) {_isX = is_x;}
     int count() {return _vector->count();}
 
     virtual bool event(QEvent * event);
 
+  public Q_SLOTS:
+    void fillVectors();
+
   Q_SIGNALS:
     void selectionChanged(const QString&);
     void contentChanged(); // something in the combo changed (new or edit)