Index: a/scribus/ui/stylemanager.cpp
===================================================================
--- a/scribus/ui/stylemanager.cpp	(revision 25249)
+++ a/scribus/ui/stylemanager.cpp	(working copy)
@@ -65,7 +65,6 @@
 	m_newPopup->setEnabled(false);
 
 	connect(m_newPopup, SIGNAL(triggered(QAction*)), this, SLOT(slotNewPopup(QAction*)));
-	connect(okButton, SIGNAL(clicked()), this, SLOT(slotOk()));
 	connect(importButton, SIGNAL(clicked()), this, SLOT(slotImport()));
 	connect(resetButton, SIGNAL(clicked()), this, SLOT(slotClean()));
 	connect(applyButton, SIGNAL(clicked()), this, SLOT(slotApply()));
@@ -99,11 +98,6 @@
 /***********************************/
 // These are for general Style Manager widgets (not for c/pstyles except the name field
 
-	// for the "<< Done" button when in edit mode
-	m_exitEditModeOk = tr("Apply all changes and exit edit mode");
-	// for the "Edit >>" button when not in edit mode
-	m_enterEditModeOk= tr("Edit styles");
-
 	nameEdit->setToolTip(     tr("Name of the selected style"));
 	resetButton->setToolTip(  tr("Reset all changes"));
 	applyButton->setToolTip(  tr("Apply all changes"));
@@ -121,17 +115,11 @@
 	applyButton->setText( tr("&Apply"));
 	m_doneText= tr("&Done");
 	m_editText= tr("&Edit");
-	setOkButtonText();
 	newButton->setText( tr("&New"));
 	importButton->setText( tr("&Import"));
 	cloneButton->setText( tr("&Clone"));
 	deleteButton->setText( tr("&Delete"));
 
-	if (m_isEditMode)
-		okButton->setToolTip( m_exitEditModeOk);
-	else
-		okButton->setToolTip( m_enterEditModeOk);
-
 	if (m_shortcutWidget)
 		m_shortcutWidget->languageChange();
 
@@ -196,14 +184,6 @@
 	return nullptr;
 }
 
-void StyleManager::setOkButtonText()
-{
-	if (!m_isStoryEditMode)
-		okButton->setText(m_isEditMode ? "<< " + m_doneText : m_editText + " >>");
-	else
-		okButton->setText(CommonStrings::tr_OK);
-}
-
 void StyleManager::setDoc(ScribusDoc *doc)
 {
 	ScribusDoc* oldDoc = m_doc;
@@ -290,9 +270,6 @@
 
 void StyleManager::slotDelete()
 {
-	if (!m_isEditMode)
-		slotOk(); // switch to edit mode before deleting
-
 	QStringList selected;
 
 	if (!m_rcStyle.isNull())
@@ -379,8 +356,6 @@
 //#7315 		QList<QPair<QString, QString> > selected;
 	if (dia2->exec())
 	{
-//#7385 			if (!m_isEditMode)
-//#7385 				slotOk();
 		QStringList neededColors;
 		neededColors.clear();
 
@@ -505,9 +480,6 @@
 
 void StyleManager::slotEdit()
 {
-	if (!m_isEditMode)
-		slotOk(); // switch to edit mode for cloning
-
 	if (m_rcStyle.isNull())
 		return;
 
@@ -534,9 +506,6 @@
 
 void StyleManager::slotClone()
 {
-	if (!m_isEditMode)
-		slotOk(); // switch to edit mode for cloning
-
 	if (!m_rcStyle.isNull())
 	{
 		QTreeWidgetItemIterator it(styleView);
@@ -582,10 +551,6 @@
 
 void StyleManager::slotNew()
 {
-//#5334: Don't open into edit mdoe until user has selected a style type
-// 	if (!m_isEditMode)
-// 		slotOk(); // switch to edit mode for a new style
-
 	// TODO maybe there's something more clever for this
 	m_newPopup->exec(newButton->mapToGlobal(QPoint(0, newButton->height() + 2)));
 }
@@ -592,9 +557,6 @@
 
 void StyleManager::slotNewPopup(QAction *action)
 {
-	if (!m_isEditMode)
-		slotOk(); // switch to edit mode for a new style
-
 	QString typeName = m_rcType;
 	QString actionType = action->data().toString();
 	if (actionType.isEmpty())
@@ -621,7 +583,7 @@
 	m_rcStyle.clear();
 	m_rcType.clear();
 
-	if (m_isEditMode && item) // make item the only selection if in edit mode
+	if (item) // make item the only selection if in edit mode
 	{                        // default behaviour for right clicking is not to select the item
 		styleView->clearSelection();
 		styleView->setCurrentItem(item);
@@ -705,7 +667,7 @@
 	m_rcStyle.clear();
 	m_rcType.clear();
 
-	if (m_isEditMode && item) // make item the only selection if in edit mode
+	if (item) // make item the only selection if in edit mode
 	{
 		styleView->clearSelection();
 		styleView->setCurrentItem(item);
@@ -724,8 +686,6 @@
 	{
 		//slotOk will recreate all items so sitem is invalid after that call
 		QString itext = sitem->text(0);
-		if (!m_isEditMode)
-			slotOk(); 
 		createNewStyle(itext);
 	}
 	m_rcStyle.clear();
@@ -794,77 +754,21 @@
 // open or close edit mode
 void StyleManager::slotOk()
 {
-	static bool isFirst = true;
-	if (m_isEditMode)
-	{
-		disconnect(styleView, SIGNAL(itemSelectionChanged()), this, SLOT(slotSetupWidget()));
-		slotApply();
+	slotSetupWidget();
 
-		okButton->setText(QString("%1 >>").arg( tr("&Edit")));
-		editFrame->hide();
-		applyButton->hide();
-		resetButton->hide();
-		rightFrame->hide();
-		m_isEditMode = false;
-		for (int i = 0; i < m_items.count(); ++i)
-		{
-			m_items.at(i)->apply();
-			m_items.at(i)->editMode(false);
-		}
-		okButton->setToolTip( m_enterEditModeOk);
-		slotClean();
-		slotDocSelectionChanged();
+	m_editPosition.setX(x());
+	m_editPosition.setY(y());
+	m_prefs->set("eX", x());
+	m_prefs->set("eY", y());
+	editFrame->show();
+	applyButton->show();
+	resetButton->show();
+	rightFrame->show();
+	for (int i = 0; i < m_items.count(); ++i)
+		m_items.at(i)->editMode(true);
+	slotClean();
 
-		if (!isFirst)
-			move(m_editPosition);
-		m_prefs->set("isEditMode", m_isEditMode);
-// 		qDebug() <<"CONNECT slotOK";
-// 		connect(styleView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-// 		        this, SLOT(slotApplyStyle(QTreeWidgetItem*,QTreeWidgetItem*)));
-// 		connect(styleView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
-// 				this, SLOT(slotApplyStyle(QTreeWidgetItem*,int)));
-		if (m_isStoryEditMode)
-		{
-			m_isStoryEditMode=false;
-			hide();
-		}
-
-		m_rcStyle.clear();
-		m_rcType.clear();
-	}
-	else
-	{
-// 		qDebug() <<"DISCONNECT slotOK";
-// 		disconnect(styleView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-// 				   this, SLOT(slotApplyStyle(QTreeWidgetItem*,QTreeWidgetItem*)));
-// 		disconnect(styleView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
-// 				   this, SLOT(slotApplyStyle(QTreeWidgetItem*,int)));
-
-		slotSetupWidget();
-
-		m_editPosition.setX(x());
-		m_editPosition.setY(y());
-		m_prefs->set("eX", x());
-		m_prefs->set("eY", y());
-		editFrame->show();
-		applyButton->show();
-		resetButton->show();
-		rightFrame->show();
-		m_isEditMode = true;
-		for (int i = 0; i < m_items.count(); ++i)
-			m_items.at(i)->editMode(true);
-		okButton->setToolTip( m_exitEditModeOk);
-		slotClean();
-
-		m_prefs->set("isEditMode", m_isEditMode);
-		connect(styleView, SIGNAL(itemSelectionChanged()), this, SLOT(slotSetupWidget()));
-	}
-	setOkButtonText();
-	isFirst = false;
-
-	resize(1, 1); // megahack to keep palette small
-	updateGeometry();
-	adjustSize();
+	connect(styleView, SIGNAL(itemSelectionChanged()), this, SLOT(slotSetupWidget()));
 }
 
 void StyleManager::addNewType(StyleItem *item, bool loadFromDoc)
@@ -954,18 +858,16 @@
 		++it;
 	}
 
-	if (m_isEditMode)
+	StyleItem *tmp = m_item;
+
+	for (int i = 0; i < m_items.count(); ++i)
 	{
-		StyleItem *tmp = m_item;
+		m_item = m_items.at(i);
+		reloadStyleView();
+	}
+	slotSetupWidget();
+	m_item = tmp;
 
-		for (int i = 0; i < m_items.count(); ++i)
-		{
-			m_item = m_items.at(i);
-			reloadStyleView();
-		}
-		slotSetupWidget();
-		m_item = tmp;
-	}
 	applyButton->setEnabled(false);
 	resetButton->setEnabled(false);
 	uniqueLabel->hide();
@@ -1036,7 +938,6 @@
 {
 	if (m_item && name.isEmpty())
 	{
-		okButton->setEnabled(false);
 		applyButton->setEnabled(false);
 		return;
 	}
@@ -1043,7 +944,6 @@
 	if (m_item && !nameIsUnique(name))
 	{
 		uniqueLabel->show();
-		okButton->setEnabled(false);
 		applyButton->setEnabled(false);
 		return;
 	}
@@ -1050,7 +950,6 @@
 	if (uniqueLabel->isVisible())
 	{
 		uniqueLabel->hide();
-		okButton->setEnabled(true);
 		applyButton->setEnabled(true);
 	}
 
@@ -1146,18 +1045,7 @@
 
 void StyleManager::slotApplyStyle(const QString& keyString)
 {
-	if (m_isEditMode)
-		return;
-
-	QStringList slist = keyString.split(SEPARATOR, Qt::SkipEmptyParts);
-	Q_ASSERT(slist.count() == 2);
-
-	loadType(slist[0]);
-	m_item->toSelection(slist[1]);
-	slotDocSelectionChanged();
-
-	m_rcStyle.clear();
-	m_rcType.clear();
+	return;
 }
 
 bool StyleManager::nameIsUnique(const QString &name)
@@ -1224,7 +1112,7 @@
 {
 	StyleViewItem *sitem = dynamic_cast<StyleViewItem*>(item);
 
-	if (m_isEditMode || !sitem || sitem->isRoot())
+	if (!sitem || sitem->isRoot())
 		return; // don't apply a style in edit mode or if there was no item/type selected
 
 	styleView->clearSelection();
@@ -1254,44 +1142,7 @@
 
 void StyleManager::slotDocSelectionChanged()
 {
-	if (m_isEditMode)
-		return; // don't track changes when in edit mode
-
-// 	qDebug() << "Style Manager : doc selection changed";
-
-// 	qDebug() <<"DISCONNECT slotDocSelectionChanged";
-// 	disconnect(styleView, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-// 	           this, SLOT(slotApplyStyle(QTreeWidgetItem*, QTreeWidgetItem*)));
-
-	styleView->clearSelection();
-
-	QList<QPair<QString, QString> > selected;
-
-	for (int i = 0; i < m_items.count(); ++i)
-		selected << QPair<QString, QString>(m_items.at(i)->typeName(), m_items.at(i)->fromSelection());
-	
-	QTreeWidgetItemIterator it(styleView, QTreeWidgetItemIterator::Selectable);
-	StyleViewItem *item;
-
-	while (*it)
-	{
-		item = dynamic_cast<StyleViewItem*>(*it);
-		if (item)
-		{
-			for (int i = 0; i < selected.count(); ++i)
-			{
-				if (item->rootName() == selected[i].first && item->text(NAME_COL) == selected[i].second)
-				{
-					styleView->setCurrentItem(item);
-					item->setSelected(true);
-				}
-			}
-		}
-		++it;
-	}
-// 	qDebug() <<"CONNECT slotDocSelectionChanged";
-// 	connect(styleView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-// 	        this, SLOT(slotApplyStyle(QTreeWidgetItem*,QTreeWidgetItem*)));
+	return; // don't track changes when in edit mode
 }
 
 void StyleManager::slotDocStylesChanged()
@@ -1379,7 +1230,6 @@
 		disconnect(m_doc->m_Selection, SIGNAL(selectionChanged()), this, SLOT(slotDocSelectionChanged()));
 	m_prefs->set("eX", x());
 	m_prefs->set("eY", y());
-	m_prefs->set("isEditMode", m_isEditMode);
 	m_prefs->set("InitX", x());
 	m_prefs->set("InitY", y());
 	storeVisibility(false);
@@ -1392,7 +1242,6 @@
 {
 	m_prefs->set("eX", x());
 	m_prefs->set("eY", y());
-	m_prefs->set("isEditMode", m_isEditMode);
 	m_prefs->set("InitX", x());
 	m_prefs->set("InitY", y());
 	storeVisibility(false);
@@ -1410,7 +1259,6 @@
 		applyButton->setEnabled(false);
 		slotEdit();
 	}
-	setOkButtonText();
 	ScrPaletteBase::showEvent(e);
 	if (isFirst)
 	{
@@ -1426,7 +1274,6 @@
 {
 	m_prefs->set("eX", x());
 	m_prefs->set("eY", y());
-	m_prefs->set("isEditMode", m_isEditMode);
 	m_prefs->set("InitX", x());
 	m_prefs->set("InitY", y());
 	storeVisibility(this->isVisible());
Index: a/scribus/ui/stylemanager.h
===================================================================
--- a/scribus/ui/stylemanager.h	(revision 25249)
+++ a/scribus/ui/stylemanager.h	(working copy)
@@ -64,13 +64,10 @@
 //	QAction            *m_rcpToScrapId;
 	ScrAction	*m_selectedStyleAction { nullptr };
 
-	bool                m_isEditMode { true };
 	bool                m_isStoryEditMode { false };
 	QPoint              m_editPosition;
 	QString             m_rcStyle;
 	QString             m_rcType;
-	QString             m_exitEditModeOk;
-	QString             m_enterEditModeOk;
 	QString             m_doneText;
 	QString             m_editText;
 
Index: a/scribus/ui/stylemanager.ui
===================================================================
--- a/scribus/ui/stylemanager.ui	(revision 25249)
+++ a/scribus/ui/stylemanager.ui	(working copy)
@@ -372,28 +384,6 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QPushButton" name="okButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>85</width>
-           <height>24</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>&lt;&lt; &amp;Done</string>
-         </property>
-         <property name="shortcut">
-          <string>Alt+D</string>
-         </property>
-        </widget>
-       </item>
-       <item>
         <widget class="QPushButton" name="applyButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
