--- a/UserPreferences.st	Wed Feb 08 01:04:08 2017 +0100
+++ b/UserPreferences.st	Wed Feb 08 19:04:45 2017 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1998 by eXept Software AG
 	      All Rights Reserved
@@ -872,8 +874,6 @@
     ^ modified ? false
 ! !
 
-
-
 !UserPreferences methodsFor:'accessing-locale'!
 
 dateInputFormat
@@ -1607,7 +1607,6 @@
     ^ DiffCodeView
 ! !
 
-
 !UserPreferences methodsFor:'accessing-prefs-UI'!
 
 allowMouseWheelZoom
@@ -2335,7 +2334,9 @@
 selectOnRightClick
     "the Windows behavior of selecting on a right-click"
 
-    ^ self at:#selectOnRightClick ifAbsent:false
+    ^ self 
+        at:#selectOnRightClick 
+        ifAbsent:[ OperatingSystem isMSWINDOWSlike ]
 !
 
 selectOnRightClick:aBoolean
@@ -2411,7 +2412,9 @@
 showRightButtonMenuOnRelease
     "the Windows behavior of showing the right-button menu on a release."
 
-    ^ self at:#showRightButtonMenuOnRelease ifAbsent:true
+    ^ self 
+        at:#showRightButtonMenuOnRelease 
+        ifAbsent:[ OperatingSystem isMSWINDOWSlike ]
 !
 
 showRightButtonMenuOnRelease:aBoolean