diff --git a/ApplicationCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp b/ApplicationCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp
index 58cb681fc8..f9a3ab0796 100644
--- a/ApplicationCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp
@@ -70,5 +70,6 @@ void RicExitApplicationFeature::onActionTriggered( bool isChecked )
 void RicExitApplicationFeature::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "E&xit" );
-    actionToSetup->setShortcut( QKeySequence::Quit );
+
+    applyShortcutWithHintToAction( actionToSetup, QKeySequence::Quit );
 }
diff --git a/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp b/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
index b9fd797b6c..6a287abc47 100644
--- a/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
@@ -266,5 +266,6 @@ void RicHelpOpenUsersGuideFeature::onActionTriggered( bool isChecked )
 void RicHelpOpenUsersGuideFeature::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "&Users Guide" );
-    actionToSetup->setShortcut( QKeySequence::HelpContents );
+
+    applyShortcutWithHintToAction( actionToSetup, QKeySequence::HelpContents );
 }
diff --git a/ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.cpp b/ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.cpp
index 11e6faba08..069beff491 100644
--- a/ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.cpp
@@ -69,5 +69,6 @@ void RicOpenProjectFeature::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "Open Project" );
     actionToSetup->setIcon( QIcon( ":/openFolder24x24.png" ) );
-    actionToSetup->setShortcuts( QKeySequence::Open );
+
+    applyShortcutWithHintToAction( actionToSetup, QKeySequence::Open );
 }
diff --git a/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp b/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp
index a64a7f41c2..374465c038 100644
--- a/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp
@@ -92,5 +92,6 @@ void RicSaveProjectAsFeature::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "Save Project &As" );
     actionToSetup->setIcon( QIcon( ":/Save.png" ) );
-    actionToSetup->setShortcuts( QKeySequence::SaveAs );
+
+    applyShortcutWithHintToAction( actionToSetup, QKeySequence::SaveAs );
 }
diff --git a/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp b/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp
index fa4f6568af..8d34de559e 100644
--- a/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp
@@ -101,7 +101,8 @@ void RicSaveProjectFeature::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "&Save Project" );
     actionToSetup->setIcon( QIcon( ":/Save.png" ) );
-    actionToSetup->setShortcuts( QKeySequence::Save );
+
+    applyShortcutWithHintToAction( actionToSetup, QKeySequence::Save );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp b/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
index 5beb83479e..a998b01ec7 100644
--- a/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
+++ b/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
@@ -87,5 +87,6 @@ void RicCreatePlotFromTemplateByShortcutFeature::setupActionLook( QAction* actio
     actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
 
     QKeySequence keySeq( Qt::CTRL + Qt::Key_T );
-    actionToSetup->setShortcut( keySeq );
+
+    applyShortcutWithHintToAction( actionToSetup, keySeq );
 }
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicActivateCurveFilterInToolbarFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicActivateCurveFilterInToolbarFeature.cpp
index 4d766996bc..8e4ff89a6d 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicActivateCurveFilterInToolbarFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicActivateCurveFilterInToolbarFeature.cpp
@@ -54,5 +54,6 @@ void RicActivateCurveFilterInToolbarFeature::onActionTriggered( bool isChecked )
 void RicActivateCurveFilterInToolbarFeature::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "Activate Summary Curve Filter Editor" );
-    actionToSetup->setShortcut( QKeySequence( tr( "Ctrl+F" ) ) );
+
+    applyShortcutWithHintToAction( actionToSetup, QKeySequence( tr( "Ctrl+F" ) ) );
 }
diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp
index 2ba6884ba2..2afcca0c4e 100644
--- a/ApplicationCode/UserInterface/RiuMainWindow.cpp
+++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp
@@ -328,27 +328,27 @@ void RiuMainWindow::createActions()
     // View actions
     m_viewFromNorth = new QAction( QIcon( ":/SouthViewArrow.png" ), "Look South", this );
     m_viewFromNorth->setToolTip( "Look South (Ctrl+Alt+S)" );
-    m_viewFromNorth->setShortcut( QKeySequence( tr( "Ctrl+Alt+S" ) ) );
+    caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromNorth, QKeySequence( tr( "Ctrl+Alt+S" ) ) );
 
     m_viewFromSouth = new QAction( QIcon( ":/NorthViewArrow.png" ), "Look North", this );
     m_viewFromSouth->setToolTip( "Look North (Ctrl+Alt+N)" );
-    m_viewFromSouth->setShortcut( QKeySequence( tr( "Ctrl+Alt+N" ) ) );
+    caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromSouth, QKeySequence( tr( "Ctrl+Alt+N" ) ) );
 
     m_viewFromEast = new QAction( QIcon( ":/WestViewArrow.png" ), "Look West", this );
     m_viewFromEast->setToolTip( "Look West (Ctrl+Alt+W)" );
-    m_viewFromEast->setShortcut( QKeySequence( tr( "Ctrl+Alt+W" ) ) );
+    caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromEast, QKeySequence( tr( "Ctrl+Alt+W" ) ) );
 
     m_viewFromWest = new QAction( QIcon( ":/EastViewArrow.png" ), "Look East", this );
     m_viewFromWest->setToolTip( "Look East (Ctrl+Alt+E)" );
-    m_viewFromWest->setShortcut( QKeySequence( tr( "Ctrl+Alt+E" ) ) );
+    caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromWest, QKeySequence( tr( "Ctrl+Alt+E" ) ) );
 
     m_viewFromAbove = new QAction( QIcon( ":/DownViewArrow.png" ), "Look Down", this );
     m_viewFromAbove->setToolTip( "Look Down (Ctrl+Alt+D)" );
-    m_viewFromAbove->setShortcut( QKeySequence( tr( "Ctrl+Alt+D" ) ) );
+    caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromAbove, QKeySequence( tr( "Ctrl+Alt+D" ) ) );
 
     m_viewFromBelow = new QAction( QIcon( ":/UpViewArrow.png" ), "Look Up", this );
     m_viewFromBelow->setToolTip( "Look Up (Ctrl+Alt+U)" );
-    m_viewFromBelow->setShortcut( QKeySequence( tr( "Ctrl+Alt+U" ) ) );
+    caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromBelow, QKeySequence( tr( "Ctrl+Alt+U" ) ) );
 
     connect( m_viewFromNorth, SIGNAL( triggered() ), SLOT( slotViewFromNorth() ) );
     connect( m_viewFromSouth, SIGNAL( triggered() ), SLOT( slotViewFromSouth() ) );