diff --git a/rd_ui/app/scripts/visualizations/base.js b/rd_ui/app/scripts/visualizations/base.js
index cea6945789..86581d8be7 100644
--- a/rd_ui/app/scripts/visualizations/base.js
+++ b/rd_ui/app/scripts/visualizations/base.js
@@ -152,6 +152,8 @@
           if (type && oldType != type && scope.visualization && !scope.visForm.name.$dirty) {
             scope.visualization.name = _.string.titleize(scope.visualization.type);
           }
+
+          scope.visualization.options = Visualization.visualizations[scope.visualization.type].defaultOptions;
         });
 
         scope.submit = function () {
diff --git a/rd_ui/app/scripts/visualizations/map.js b/rd_ui/app/scripts/visualizations/map.js
index bef8e390c6..2edd5d9e18 100644
--- a/rd_ui/app/scripts/visualizations/map.js
+++ b/rd_ui/app/scripts/visualizations/map.js
@@ -10,7 +10,10 @@
       '</map-renderer>';
 
     var editTemplate = '<map-editor></map-editor>';
-    var defaultOptions = { 'height': 500 };
+    var defaultOptions = {
+      'height': 500,
+      'draw': 'Marker'
+    };
 
     VisualizationProvider.registerVisualization({
       type: 'MAP',
@@ -227,9 +230,6 @@
       link: function($scope, elm, attrs) {
         $scope.visualization.options.draw_options = ['Marker','Color'];
         $scope.visualization.options.classify_columns = $scope.queryResult.columnNames.concat('none');
-
-        //FIXME: The following line should be removed when defaultOptions work
-        $scope.visualization.options.height = $scope.visualization.options.height || 500;
       }
     }
   });