diff --git a/app/assets/javascripts/map.js b/app/assets/javascripts/map.js
index dc9c92ef1..a0f5bd7c6 100644
--- a/app/assets/javascripts/map.js
+++ b/app/assets/javascripts/map.js
@@ -49,7 +49,7 @@
         markerLatitude = dataCoordinates.lat;
         markerLongitude = dataCoordinates.long;
         mapCenterLatitude = dataCoordinates.lat;
-        mapCenterLongitude = dataCoordinates.lat;
+        mapCenterLongitude = dataCoordinates.long;
       } else {
         mapCenterLatitude = $(element).data("map-center-latitude");
         mapCenterLongitude = $(element).data("map-center-longitude");
diff --git a/spec/shared/system/mappable.rb b/spec/shared/system/mappable.rb
index 70c4266d7..0ef6d4fac 100644
--- a/spec/shared/system/mappable.rb
+++ b/spec/shared/system/mappable.rb
@@ -283,12 +283,14 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
       do_login_for(user) if management
     end
 
-    scenario "Should display map on #{mappable_factory_name} show page", :js do
+    scenario "Should display map and marker on #{mappable_factory_name} show page", :js do
       arguments[:id] = mappable.id
 
       visit send(mappable_show_path, arguments)
 
-      expect(page).to have_css(".map_location")
+      within ".map_location" do
+        expect(page).to have_css(".map-icon")
+      end
     end
 
     scenario "Should not display map on #{mappable_factory_name} show when marker is not defined", :js do