diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 7fae4894a..730216a8b 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -108,6 +108,7 @@ sub new {
     # We can only enable multi sample anti aliasing wih wxWidgets 3.0.3 and with a hacked Wx::GLCanvas,
     # which exports some new WX_GL_XXX constants, namely WX_GL_SAMPLE_BUFFERS and WX_GL_SAMPLES.
     my $can_multisample =
+        ! wxTheApp->{app_config}->get('use_legacy_opengl') &&
         Wx::wxVERSION >= 3.000003 &&
         defined Wx::GLCanvas->can('WX_GL_SAMPLE_BUFFERS') &&
         defined Wx::GLCanvas->can('WX_GL_SAMPLES');
diff --git a/lib/Slic3r/GUI/Preferences.pm b/lib/Slic3r/GUI/Preferences.pm
index 0f0f319fe..703a7a762 100644
--- a/lib/Slic3r/GUI/Preferences.pm
+++ b/lib/Slic3r/GUI/Preferences.pm
@@ -76,7 +76,7 @@ sub new {
         opt_id      => 'use_legacy_opengl',
         type        => 'bool',
         label       => 'Use legacy OpenGL 1.1 rendering',
-        tooltip     => 'If you have rendering issues caused by a buggy OpenGL 2.0 driver, you may try to check this checkbox. This will disable the layer height editing, so it is likely better to upgrade your graphics driver.',
+        tooltip     => 'If you have rendering issues caused by a buggy OpenGL 2.0 driver, you may try to check this checkbox. This will disable the layer height editing and anti aliasing, so it is likely better to upgrade your graphics driver.',
         default     => $app_config->get("use_legacy_opengl"),
     ));