diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html
index 1c83f00e39..6ba3dcdfad 100644
--- a/platform/features/plot/res/templates/plot.html
+++ b/platform/features/plot/res/templates/plot.html
@@ -85,6 +85,7 @@
             </a>
 
             <div class="menu-element btn icon-btn very-subtle btn-menu dropdown click-invoke"
+                 ng-if="plot.getModeOptions().length > 1"
                  ng-controller="ClickAwayController as toggle">
 
                 <span ng-click="toggle.toggle()">
diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js
index e29c2afae3..b8a3b98c62 100644
--- a/platform/features/plot/src/PlotController.js
+++ b/platform/features/plot/src/PlotController.js
@@ -306,14 +306,27 @@ define(
                     panZoomStack.clearPanZoom();
                     updateDrawingBounds();
                 },
+                /**
+                 * Get the mode options (Stacked/Overlaid) that are applicable
+                 * for this plot.
+                 */
                 getModeOptions: function () {
                     return modeOptions && modeOptions.getModeOptions();
                 },
+                /**
+                 * Get the current mode that is applicable to this plot. This
+                 * will include key, name, and glyph fields.
+                 */
                 getMode: function () {
-                    return modeOptions && modeOptions.getModeOptions()[0];
+                    return modeOptions && modeOptions.getMode();
                 },
+                /**
+                 * Set the mode which should be active in this plot.
+                 * @param mode one of the mode options returned from
+                 *        getModeOptions()
+                 */
                 setMode: function (mode) {
-                    console.log(mode);
+                    return modeOptions && modeOptions.setMode(mode);
                 }
 
             };
diff --git a/platform/features/plot/src/modes/PlotModeOptions.js b/platform/features/plot/src/modes/PlotModeOptions.js
index 0fbbf8590a..8afb3c7234 100644
--- a/platform/features/plot/src/modes/PlotModeOptions.js
+++ b/platform/features/plot/src/modes/PlotModeOptions.js
@@ -18,15 +18,19 @@ define(
 
         function PlotModeOptions(telemetryObjects) {
             var options = telemetryObjects.length > 1 ?
-                    [ STACKED, OVERLAID ] : [ OVERLAID, STACKED ];
+                    [ OVERLAID, STACKED ] : [ OVERLAID ],
+                mode = options[0];
 
 
             return {
                 getModeOptions: function () {
                     return options;
                 },
-                getMode: function (option) {
-
+                getMode: function () {
+                    return mode;
+                },
+                setMode: function (option) {
+                    mode = option;
                 }
             };
         }