diff --git a/sources/factory/ui/addtabledialog.cpp b/sources/factory/ui/addtabledialog.cpp
index fdbb050ce..c6626c953 100644
--- a/sources/factory/ui/addtabledialog.cpp
+++ b/sources/factory/ui/addtabledialog.cpp
@@ -19,6 +19,7 @@
 #include "ui_addtabledialog.h"
 #include "elementquerywidget.h"
 #include "marginseditdialog.h"
+#include "qetutils.h"
 
 #include <QFontDialog>
 
@@ -34,7 +35,11 @@ AddTableDialog::AddTableDialog(QWidget *parent) :
 	ui->m_header_font_pb->setText(m_header_font.family());
 	ui->m_table_font_pb->setText(m_table_font.family());
 	ui->m_tab->addTab(m_query_widget, tr("Contenu"));
-	ui->m_config_gb->setDisabled(true);
+	fillSavedQuery();
+	
+	connect(ui->m_config_gb, &ConfigSaveLoaderWidget::saveClicked, this, &AddTableDialog::saveConfig);
+	connect(ui->m_config_gb, &ConfigSaveLoaderWidget::loadClicked, this, &AddTableDialog::loadConfig);
+	
 }
 
 /**
@@ -185,3 +190,112 @@ void AddTableDialog::on_m_table_margins_pb_clicked()
 	if (accept)
 		m_table_margins = margins_;
 }
+
+void AddTableDialog::saveConfig()
+{
+	QFile file_(QETApp::configDir() + "/graphics_table.json");
+	
+	if (file_.open(QFile::ReadWrite))
+	{
+		QJsonDocument doc_(QJsonDocument::fromJson(file_.readAll()));
+		QJsonObject root_object;
+		
+		if (!doc_.isEmpty())
+		{
+			root_object = doc_.object();
+			if (root_object.contains(ui->m_config_gb->text())) {
+				root_object.remove(ui->m_config_gb->text());
+			}
+		}
+		
+		QJsonObject header_object;
+		header_object.insert("margins", QETUtils::marginsToString(this->headerMargins()));
+		auto me = QMetaEnum::fromType<Qt::Alignment>();
+		header_object.insert("alignment", me.valueToKey(int(this->headerAlignment())));
+		header_object.insert("font", this->headerFont().toString());
+
+		QJsonObject table_object;
+		table_object.insert("margins", QETUtils::marginsToString(this->tableMargins()));
+		table_object.insert("alignment", me.valueToKey(int(this->tableAlignment())));
+		table_object.insert("font", this->tableFont().toString());
+
+		QJsonObject config_object;
+		config_object.insert("header", header_object);
+		config_object.insert("table", table_object);
+
+		root_object.insert(ui->m_config_gb->text(), config_object);
+
+		doc_.setObject(root_object);
+		file_.resize(0);
+		file_.write(doc_.toJson());
+	}
+}
+
+void AddTableDialog::loadConfig()
+{
+	auto name = ui->m_config_gb->selectedText();
+	if (name.isEmpty()) {
+		return;
+	}
+
+	QFile file_(QETApp::configDir() + "/graphics_table.json");
+	if (!file_.open(QFile::ReadOnly)) {
+		return;
+	}
+
+	QJsonDocument doc_(QJsonDocument::fromJson(file_.readAll()));
+	QJsonObject root_object(doc_.object());
+	auto config_object = root_object.value(name).toObject();
+	if (config_object.isEmpty()) {
+		return;
+	}
+
+	auto me = QMetaEnum::fromType<Qt::Alignment>();
+
+		//Header
+	auto header_object = config_object.value("header").toObject();
+	m_header_margins = QETUtils::marginsFromString(header_object.value("margins").toString());
+	switch (me.keyToValue(header_object.value("alignment").toString().toStdString().data())) {
+		case Qt::AlignLeft :
+			ui->m_header_alignment_cb->setCurrentIndex(0);
+			break;
+		case Qt::AlignCenter :
+			ui->m_header_alignment_cb->setCurrentIndex(1);
+			break;
+		default:
+			ui->m_header_alignment_cb->setCurrentIndex(2);
+	}
+	m_header_font.fromString(header_object.value("font").toString());
+	ui->m_header_font_pb->setText(m_header_font.family());
+
+		//Table
+	auto table_object = config_object.value("table").toObject();
+	m_table_margins = QETUtils::marginsFromString(table_object.value("margins").toString());
+	switch (me.keyToValue(table_object.value("alignment").toString().toStdString().data())) {
+		case Qt::AlignLeft :
+			ui->m_table_alignment_cb->setCurrentIndex(0);
+			break;
+		case Qt::AlignCenter :
+			ui->m_table_alignment_cb->setCurrentIndex(1);
+			break;
+		default:
+			ui->m_table_alignment_cb->setCurrentIndex(2);
+	}
+	m_table_font.fromString(table_object.value("font").toString());
+	ui->m_table_font_pb->setText(m_table_font.family());
+
+}
+
+void AddTableDialog::fillSavedQuery()
+{
+	QFile file(QETApp::configDir() + "/graphics_table.json");
+	if (file.open(QFile::ReadOnly))
+	{
+		QJsonDocument jsd(QJsonDocument::fromJson(file.readAll()));
+		QJsonObject jso = jsd.object();
+
+		for (auto it = jso.begin() ; it != jso.end() ; ++it) {
+			ui->m_config_gb->addItem(it.key());
+		}
+	}
+}
diff --git a/sources/factory/ui/addtabledialog.h b/sources/factory/ui/addtabledialog.h
index 9771eaafc..cdf3e5c76 100644
--- a/sources/factory/ui/addtabledialog.h
+++ b/sources/factory/ui/addtabledialog.h
@@ -63,6 +63,9 @@ class AddTableDialog : public QDialog
 		void on_m_table_font_pb_clicked();
 		void on_m_edit_header_margins_pb_clicked();
 		void on_m_table_margins_pb_clicked();
+		void saveConfig();
+		void loadConfig();
+		void fillSavedQuery();
 
 	private:
 		Ui::AddTableDialog *ui;
diff --git a/sources/factory/ui/addtabledialog.ui b/sources/factory/ui/addtabledialog.ui
index 9b2a6649b..67ff8c240 100644
--- a/sources/factory/ui/addtabledialog.ui
+++ b/sources/factory/ui/addtabledialog.ui
@@ -195,6 +195,9 @@
        </item>
        <item>
         <widget class="ConfigSaveLoaderWidget" name="m_config_gb">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
          <property name="title">
           <string>Configuration</string>
          </property>
diff --git a/sources/ui/configsaveloaderwidget.cpp b/sources/ui/configsaveloaderwidget.cpp
index 5b9b859d8..c224ac658 100644
--- a/sources/ui/configsaveloaderwidget.cpp
+++ b/sources/ui/configsaveloaderwidget.cpp
@@ -38,6 +38,10 @@ QString ConfigSaveLoaderWidget::text() const {
 	return ui->m_line_edit->text();
 }
 
+void ConfigSaveLoaderWidget::addItem(QString text) {
+	ui->m_combo_box->addItem(text);
+}
+
 void ConfigSaveLoaderWidget::on_m_load_pb_clicked() {
 	emit loadClicked();
 }
diff --git a/sources/ui/configsaveloaderwidget.h b/sources/ui/configsaveloaderwidget.h
index a73bc23d9..be5e5f43d 100644
--- a/sources/ui/configsaveloaderwidget.h
+++ b/sources/ui/configsaveloaderwidget.h
@@ -42,6 +42,7 @@ class ConfigSaveLoaderWidget : public QGroupBox
 
 		QString selectedText() const;
 		QString text()const;
+		void addItem(QString text);
 
 	signals:
 		void loadClicked();