Index: src/net/sf/freecol/client/gui/panel/MiniMap.java
===================================================================
--- src/net/sf/freecol/client/gui/panel/MiniMap.java	(revision 10466)
+++ src/net/sf/freecol/client/gui/panel/MiniMap.java	(working copy)
@@ -368,9 +368,19 @@
 
 
     private void focus(int x, int y) {
-        int tileX = ((x - adjustX) / tileSize) + firstColumn;
-        int tileY = ((y - adjustY) / tileSize * 4) + firstRow;
+		int tileX, tileY;
 
+		//If statement is for when the minimap is on maximum focus out.
+		if (adjustX > 0 && adjustY > 0) {
+			tileX = ((4 * x + (tileSize - 4) * adjustX) / (4 * tileSize))
+					+ firstColumn;
+			tileY = ((4 * y + (tileSize - 4) * adjustY) / tileSize) + firstRow;
+		} 
+		else {
+			tileX = ((x - adjustX) / tileSize) + firstColumn;
+			tileY = ((y - adjustY) / tileSize * 4) + firstRow;
+		}
+
         gui.setFocus(freeColClient.getGame().getMap().getTile(tileX,tileY));
     }