diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp
index 73c73dd8..0f2267a3 100644
--- a/src/gui/src/ServerConfig.cpp
+++ b/src/gui/src/ServerConfig.cpp
@@ -51,7 +51,7 @@ ServerConfig::ServerConfig(QSettings* settings, int numColumns, int numRows ,
 	m_ServerName(serverName),
 	m_IgnoreAutoConfigClient(false),
 	m_EnableDragAndDrop(false),
-	m_EnableClipboard(true),
+	m_ClipboardSharing(true),
 	m_pMainWindow(mainWindow)
 {
 	Q_ASSERT(m_pSettings);
@@ -247,7 +247,7 @@ QTextStream& operator<<(QTextStream& outStream, const ServerConfig& config)
 	outStream << "\t" << "relativeMouseMoves = " << (config.relativeMouseMoves() ? "true" : "false") << endl;
 	outStream << "\t" << "screenSaverSync = " << (config.screenSaverSync() ? "true" : "false") << endl;
 	outStream << "\t" << "win32KeepForeground = " << (config.win32KeepForeground() ? "true" : "false") << endl;
-	outStream << "\t" << "enableClipboard = " << (config.enableClipboard() ? "true" : "false") << endl;
+	outStream << "\t" << "clipboardSharing = " << (config.clipboardSharing() ? "true" : "false") << endl;
 
 	if (config.hasSwitchDelay())
 		outStream << "\t" << "switchDelay = " << config.switchDelay() << endl;
diff --git a/src/gui/src/ServerConfig.h b/src/gui/src/ServerConfig.h
index 8132b8e8..136c5f2b 100644
--- a/src/gui/src/ServerConfig.h
+++ b/src/gui/src/ServerConfig.h
@@ -62,7 +62,7 @@ class ServerConfig : public BaseConfig
 		const HotkeyList& hotkeys() const { return m_Hotkeys; }
 		bool ignoreAutoConfigClient() const { return m_IgnoreAutoConfigClient; }
 		bool enableDragAndDrop() const { return m_EnableDragAndDrop; }
-		bool enableClipboard() const { return m_EnableClipboard; }
+		bool clipboardSharing() const { return m_ClipboardSharing; }
 
 		void saveSettings();
 		void loadSettings();
@@ -91,7 +91,7 @@ class ServerConfig : public BaseConfig
 		void setSwitchCornerSize(int val) { m_SwitchCornerSize = val; }
 		void setIgnoreAutoConfigClient(bool on) { m_IgnoreAutoConfigClient = on; }
 		void setEnableDragAndDrop(bool on) { m_EnableDragAndDrop = on; }
-		void setEnableClipboard(bool on) { m_EnableClipboard = on; }
+		void setClipboardSharing(bool on) { m_ClipboardSharing = on; }
 		QList<bool>& switchCorners() { return m_SwitchCorners; }
 		HotkeyList& hotkeys() { return m_Hotkeys; }
 
@@ -124,7 +124,7 @@ class ServerConfig : public BaseConfig
 		QString m_ServerName;
 		bool m_IgnoreAutoConfigClient;
 		bool m_EnableDragAndDrop;
-		bool m_EnableClipboard;
+		bool m_ClipboardSharing;
 		MainWindow* m_pMainWindow;
 };
 
diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
index 07d6796f..c6691286 100644
--- a/src/gui/src/ServerConfigDialog.cpp
+++ b/src/gui/src/ServerConfigDialog.cpp
@@ -58,7 +58,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget* parent, ServerConfig& config, co
 
 	m_pCheckBoxEnableDragAndDrop->setChecked(serverConfig().enableDragAndDrop());
 
-	m_pCheckBoxEnableClipboard->setChecked(serverConfig().enableClipboard());
+	m_pCheckBoxEnableClipboard->setChecked(serverConfig().clipboardSharing());
 
 	foreach(const Hotkey& hotkey, serverConfig().hotkeys())
 		m_pListHotkeys->addItem(hotkey.text());
@@ -102,7 +102,7 @@ void ServerConfigDialog::accept()
 	serverConfig().setSwitchCornerSize(m_pSpinBoxSwitchCornerSize->value());
 	serverConfig().setIgnoreAutoConfigClient(m_pCheckBoxIgnoreAutoConfigClient->isChecked());
 	serverConfig().setEnableDragAndDrop(m_pCheckBoxEnableDragAndDrop->isChecked());
-	serverConfig().setEnableClipboard(m_pCheckBoxEnableClipboard->isChecked());
+	serverConfig().setClipboardSharing(m_pCheckBoxEnableClipboard->isChecked());
 
 	// now that the dialog has been accepted, copy the new server config to the original one,
 	// which is a reference to the one in MainWindow.