diff --git a/include/config_mgr.h b/include/config_mgr.h
index 0708daa52..480c4d0de 100644
--- a/include/config_mgr.h
+++ b/include/config_mgr.h
@@ -163,16 +163,6 @@ public:
 		return( m_recentlyOpenedProjects );
 	}
 
-	const bool isAutoquitDisabled() const
-	{
-		return m_isAutoquitDisabled;
-	}
-
-	void setAutoquitDisabled( bool value )
-	{
-		m_isAutoquitDisabled = value;
-	}
-
 	void addRecentlyOpenedProject( const QString & _file );
 
 	const QString & value( const QString & _class,
@@ -219,8 +209,6 @@ private:
 	QString m_backgroundArtwork;
 	QStringList m_recentlyOpenedProjects;
 
-	bool m_isAutoquitDisabled;
-
 	typedef QVector<QPair<QString, QString> > stringPairVector;
 	typedef QMap<QString, stringPairVector> settingsMap;
 	settingsMap m_settings;
diff --git a/include/setup_dialog.h b/include/setup_dialog.h
index 00a51c22f..a4136e397 100644
--- a/include/setup_dialog.h
+++ b/include/setup_dialog.h
@@ -161,6 +161,7 @@ private:
 	bool m_animateAFP;
 	bool m_printNoteLabels;
 	bool m_displayWaveform;
+	bool m_disableAutoQuit;
 
 	typedef QMap<QString, AudioDevice::setupWidget *> AswMap;
 	typedef QMap<QString, MidiClient::setupWidget *> MswMap;
diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index c49834d4c..e11c83d6c 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -133,7 +133,7 @@ Effect * Effect::instantiate( const QString& pluginName,
 
 void Effect::checkGate( double _out_sum )
 {
-	if( configManager::inst()->isAutoquitDisabled() )
+	if( configManager::inst()->value( "ui", "disableautoquit").toInt() )
 	{
 		return;
 	}
diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp
index 437bfb27a..623028da2 100644
--- a/src/gui/setup_dialog.cpp
+++ b/src/gui/setup_dialog.cpp
@@ -121,7 +121,9 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 	m_printNoteLabels(configManager::inst()->value( "ui",
 						   "printnotelabels").toInt() ),
 	m_displayWaveform(configManager::inst()->value( "ui",
-						   "displaywaveform").toInt() )
+						   "displaywaveform").toInt() ),
+	m_disableAutoQuit(configManager::inst()->value( "ui",
+						   "disableautoquit").toInt() )
 {
 	setWindowIcon( embed::getIconPixmap( "setup_general" ) );
 	setWindowTitle( tr( "Setup LMMS" ) );
@@ -294,7 +296,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 								misc_tw );
 	labelNumber++;
 	disableAutoquit->move( XDelta, YDelta*labelNumber );
-	disableAutoquit->setChecked( configManager::inst()->isAutoquitDisabled() );
+	disableAutoquit->setChecked( m_disableAutoQuit );
 	connect( disableAutoquit, SIGNAL( toggled( bool ) ),
 				this, SLOT( toggleDisableAutoquit( bool ) ) );
 
@@ -823,7 +825,7 @@ void setupDialog::accept()
 	configManager::inst()->setValue( "ui", "displaywaveform",
 					QString::number( m_displayWaveform ) );
 	configManager::inst()->setValue( "ui", "disableautoquit",
-					QString::number( configManager::inst()->isAutoquitDisabled() ) );
+					QString::number( m_disableAutoQuit ) );
 
 
 	configManager::inst()->setWorkingDir( m_workingDir );
@@ -1015,7 +1017,7 @@ void setupDialog::toggleDisplayWaveform( bool en )
 
 void setupDialog::toggleDisableAutoquit( bool en )
 {
-	configManager::inst()->setAutoquitDisabled( en );
+	m_disableAutoQuit = en;
 }