diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationTopComponent.java b/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationTopComponent.java
index 1e3143d678..7e096aa4d7 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationTopComponent.java
@@ -33,6 +33,7 @@ import org.jxmapviewer.viewer.Waypoint;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.RetainLocation;
 import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import static org.sleuthkit.autopsy.casemodule.Case.Events.CURRENT_CASE;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -52,6 +53,8 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
 @RetainLocation("geolocation")
 @SuppressWarnings("PMD.SingularField")
 public final class GeolocationTopComponent extends TopComponent {
+    
+    private static final long serialVersionUID = 1L;
 
     private static final Logger logger = Logger.getLogger(GeolocationTopComponent.class.getName());
 
@@ -127,6 +130,17 @@ public final class GeolocationTopComponent extends TopComponent {
         super.removeNotify();
         IngestManager.getInstance().removeIngestModuleEventListener(ingestListener);
     }
+    
+    @Override
+    public void componentOpened() {
+        super.componentOpened();
+        WindowManager.getDefault().setTopComponentFloating(this, true);
+    }
+    
+    @Override
+    public void open() {
+        super.open();
+    }
 
     /**
      * Set the state of the refresh panel at the top of the mapPanel.
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java b/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java
index d1fb35ae46..fc969c58e8 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java
@@ -30,7 +30,7 @@ final class MapWaypoint implements org.jxmapviewer.viewer.Waypoint{
     static List<org.jxmapviewer.viewer.Waypoint> getWaypoints(SleuthkitCase skCase) throws TskCoreException{
         List<Waypoint> points = Waypoint.getAllWaypoints(skCase);
         
-        List<Route> routes = Route.getGPSRoutes(skCase);
+        List<Route> routes = Route.getRoutes(skCase);
         for(Route route: routes) {
             points.addAll(route.getRoute());
         }
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java b/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java
index e13031cd6e..e0f8d42389 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java
@@ -42,7 +42,9 @@ import org.sleuthkit.autopsy.core.RuntimeProperties;
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 102)})
 public class OpenGeolocationAction extends CallableSystemAction {
-
+    
+    private static final long serialVersionUID = 1L;
+    
     @Messages({
         "OpenGeolocationAction_name=Geolocation",
         "OpenGeolocationAction_displayName=Geolocation"