--- a/app/src/main/java/com/codesys/forge/MainActivity.java
+++ b/app/src/main/java/com/codesys/forge/MainActivity.java
@@ -28,7 +28,9 @@
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.webkit.MimeTypeMap;
+import android.webkit.WebBackForwardList;
 import android.webkit.WebChromeClient;
+import android.webkit.WebHistoryItem;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
@@ -279,6 +281,7 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         String myUseragent;
+        String url = this.getIntent().getStringExtra("url");
 
         super.onCreate(savedInstanceState);
 
@@ -483,6 +486,11 @@
                 case KeyEvent.KEYCODE_BACK:
                     if (myWebView.canGoBack()) {
                         myWebView.goBack();
+                        WebBackForwardList currentList = myWebView.copyBackForwardList();
+                        if ( currentList.getSize() > 0) {
+                            WebHistoryItem currentItem = currentList.getItemAtIndex(currentList.getCurrentIndex());
+                            currentURL = currentItem.getUrl();
+                        }
                     } else {
                         finish();
                     }