diff --git a/libs/piqt_utils/pivariant_edit_widgets.cpp b/libs/piqt_utils/pivariant_edit_widgets.cpp
index 2f91714..1fc7499 100644
--- a/libs/piqt_utils/pivariant_edit_widgets.cpp
+++ b/libs/piqt_utils/pivariant_edit_widgets.cpp
@@ -605,8 +605,9 @@ void PIVariantEditors::FileBase::applyAttributes(const PIVariantMap & a) {
 
 
 void PIVariantEditors::FileBase::setFullEditMode(bool on) {
-	act_save->setVisible(on);
-	act_filter->setVisible(on);
+	edit_widget->setVisible(on);
+	if (act_save) act_save->setVisible(on);
+	if (act_filter) act_filter->setVisible(on);
 }
 
 
diff --git a/libs/widgets/session_manager.cpp b/libs/widgets/session_manager.cpp
index 50069ad..eb8b23f 100644
--- a/libs/widgets/session_manager.cpp
+++ b/libs/widgets/session_manager.cpp
@@ -114,6 +114,7 @@ void SessionManager::save() {
 	QSet<QObject *> all_list;
 	foreach(QObject * c, tsc) {
 		all_list |= QList2QSet(c->findChildren<QObject *>());
+		all_list |= c;
 	}
 	QMap<const QMetaObject *, QByteArray> funcs = metaFunctions(all_list, "sessionSave");
 	// qDebug() << "check for save" << all_list.size();
@@ -237,6 +238,7 @@ void SessionManager::load(bool onlyMainwindow) {
 	QSet<QObject *> all_list;
 	foreach(QObject * c, tsc) {
 		all_list |= QList2QSet(c->findChildren<QObject *>());
+		all_list |= c;
 	}
 	QMap<const QMetaObject *, QByteArray> funcs = metaFunctions(all_list, "sessionLoad");
 	// qDebug() << "check for load" << all_list.size();