diff --git a/viewer/js/config/viewer.js b/viewer/js/config/viewer.js
index 20dfcb33e..c0ee61064 100644
--- a/viewer/js/config/viewer.js
+++ b/viewer/js/config/viewer.js
@@ -228,19 +228,15 @@ define([
             },
             geocoder: {
                 include: true,
-                id: 'geocoder',
                 type: 'domNode',
-                path: 'gis/dijit/Geocoder',
-                srcNodeRef: 'geocodeDijit',
+                path: 'esri/dijit/Search',
+                srcNodeRef: 'geocoderButton',
                 options: {
                     map: true,
-                    mapRightClickMenu: true,
-                    geocoderOptions: {
-                        autoComplete: true,
-                        arcgisGeocoder: {
-                            placeholder: 'Enter an address or place'
-                        }
-                    }
+                    visible: true,
+                    enableInfoWindow: false,
+                    enableButtonMode: true,
+                    expanded: false
                 }
             },
             identify: {
diff --git a/viewer/js/viewer/_WidgetsMixin.js b/viewer/js/viewer/_WidgetsMixin.js
index 8179ed87f..18884f6c0 100644
--- a/viewer/js/viewer/_WidgetsMixin.js
+++ b/viewer/js/viewer/_WidgetsMixin.js
@@ -113,7 +113,9 @@ define([
 
         createWidget: function (widgetConfig, options, WidgetClass) {
             // set any additional options
-            options.id = widgetConfig.id + '_widget';
+            if (widgetConfig.id) {
+                options.id = widgetConfig.id + '_widget';
+            }
             options.parentWidget = widgetConfig.parentWidget;
 
             //replace config map, layerInfos arrays, etc