diff --git a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
index 61cb1d9cd73..547cff022b8 100644
--- a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
+++ b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
@@ -1218,13 +1218,13 @@ protected:
 
     // Add custom key description (see keyPressEvent).
     setKeyDescription(::Qt::Key_E, "Toggles edges display");
-    setKeyDescription(::Qt::Key_F, "Toggles faces display");
-    setKeyDescription(::Qt::Key_G, "Switch between flat/Gouraud shading display");
     setKeyDescription(::Qt::Key_M, "Toggles mono color");
     setKeyDescription(::Qt::Key_N, "Inverse direction of normals");
+    setKeyDescription(::Qt::Key_S, "Switch between flat/Gouraud shading display");
     setKeyDescription(::Qt::Key_T, "Toggles text display");
     setKeyDescription(::Qt::Key_U, "Move camera direction upside down");
     setKeyDescription(::Qt::Key_V, "Toggles vertices display");
+    setKeyDescription(::Qt::Key_W, "Toggles faces display");
     setKeyDescription(::Qt::Key_Plus, "Increase size of edges");
     setKeyDescription(::Qt::Key_Minus, "Decrease size of edges");
     setKeyDescription(::Qt::Key_Plus+::Qt::ControlModifier, "Increase size of vertices");
@@ -1278,13 +1278,8 @@ protected:
       m_draw_edges=!m_draw_edges;
       displayMessage(QString("Draw edges=%1.").arg(m_draw_edges?"true":"false"));
       update();
-    }else if ((e->key()==::Qt::Key_F) && (modifiers==::Qt::NoButton))
-    {
-      m_draw_faces=!m_draw_faces;
-      displayMessage(QString("Draw faces=%1.").arg(m_draw_faces?"true":"false"));
-      update();
     }
-    else if ((e->key()==::Qt::Key_G) && (modifiers==::Qt::NoButton))
+    else if ((e->key()==::Qt::Key_S) && (modifiers==::Qt::NoButton))
     {
       m_flatShading=!m_flatShading;
       if (m_flatShading)
@@ -1306,6 +1301,12 @@ protected:
       negate_all_normals();
       redraw();
     }
+    else if ((e->key()==::Qt::Key_T) && (modifiers==::Qt::NoButton))
+    {
+      m_draw_text=!m_draw_text;
+      displayMessage(QString("Draw text=%1.").arg(m_draw_text?"true":"false"));
+      update();
+    }
     else if ((e->key()==::Qt::Key_U) && (modifiers==::Qt::NoButton))
     {
       if (is_two_dimensional())
@@ -1330,18 +1331,18 @@ protected:
         redraw();
       }
     }
-    else if ((e->key()==::Qt::Key_T) && (modifiers==::Qt::NoButton))
-    {
-      m_draw_text=!m_draw_text;
-      displayMessage(QString("Draw text=%1.").arg(m_draw_text?"true":"false"));
-      update();
-    }
     else if ((e->key()==::Qt::Key_V) && (modifiers==::Qt::NoButton))
     {
       m_draw_vertices=!m_draw_vertices;
       displayMessage(QString("Draw vertices=%1.").arg(m_draw_vertices?"true":"false"));
       update();
     }
+    else if ((e->key()==::Qt::Key_W) && (modifiers==::Qt::NoButton))
+    {
+      m_draw_faces=!m_draw_faces;
+      displayMessage(QString("Draw faces=%1.").arg(m_draw_faces?"true":"false"));
+      update();
+    }
     else if ((e->key()==::Qt::Key_Plus) && (!modifiers.testFlag(::Qt::ControlModifier))) // No ctrl
     {
       m_size_edges+=.5;