diff --git a/CHANGELOG.JSON b/CHANGELOG.JSON
index 0f77bcb5d..7fd7f3950 100644
--- a/CHANGELOG.JSON
+++ b/CHANGELOG.JSON
@@ -12,7 +12,8 @@
           "`FilePicker` - French translation [#449](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/449)",
           "Slovak localization [#457](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/457)",
           "`TaxonomyPicker`: Placeholder for Taxonomy Picker [#464](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/464)",
-          "`ListItemPicker`, `PeoplePicker`: Placeholder for `ListItemPicker` and `PeoplePicker` [#486](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/486)"
+          "`ListItemPicker`, `PeoplePicker`: Placeholder for `ListItemPicker` and `PeoplePicker` [#486](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/486)",
+          "`FilePicker`: Do not store active tab in url's hash [#488](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/488)"
         ],
         "fixes": [
           "`RichText`: problem with edit mode [#445](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/445)",
diff --git a/docs/documentation/docs/controls/FilePicker.md b/docs/documentation/docs/controls/FilePicker.md
index eeff97ccb..949b27039 100644
--- a/docs/documentation/docs/controls/FilePicker.md
+++ b/docs/documentation/docs/controls/FilePicker.md
@@ -74,6 +74,7 @@ The FilePicker component can be configured with the following properties:
 | hideSiteFilesTab | boolean | no | Specifies if SiteFilesTab should be hidden. |
 | hideLocalUploadTab | boolean | no | Specifies if LocalUploadTab should be hidden. |
 | hideLinkUploadTab | boolean | no | Specifies if LinkUploadTab should be hidden. |
+| storeLastActiveTab | boolean | no | Specifies if last active tab will be stored after the Upload panel has been closed. Note: the value of selected tab is stored in the queryString hash. Default `true` |
 
 interface `IFilePickerResult`
 
diff --git a/src/controls/filePicker/FilePicker.tsx b/src/controls/filePicker/FilePicker.tsx
index 75108c3dd..3d43026e6 100644
--- a/src/controls/filePicker/FilePicker.tsx
+++ b/src/controls/filePicker/FilePicker.tsx
@@ -221,12 +221,13 @@ export class FilePicker extends React.Component<IFilePickerProps, IFilePickerSta
    * Prepares navigation panel options
    */
   private _getNavPanelOptions = () => {
+    const addUrl = this.props.storeLastActiveTab !== false;
     let links = [];
 
     if (!this.props.hideRecentTab) {
       links.push({
         name: strings.RecentLinkLabel,
-        url: '#recent',
+        url: addUrl ? '#recent' : undefined,
         icon: 'Recent',
         key: 'keyRecent',
       });
@@ -234,7 +235,7 @@ export class FilePicker extends React.Component<IFilePickerProps, IFilePickerSta
     if (this.props.bingAPIKey && !this.props.hideWebSearchTab) {
       links.push({
         name: strings.WebSearchLinkLabel,
-        url: '#search',
+        url: addUrl ? '#search' : undefined,
         key: 'keyWeb',
         icon: 'Search',
       });
@@ -242,7 +243,7 @@ export class FilePicker extends React.Component<IFilePickerProps, IFilePickerSta
     if (!this.props.hideOrganisationalAssetTab && this.state.organisationAssetsEnabled) {
       links.push({
         name: 'Your organisation',
-        url: '#orgAssets',
+        url: addUrl ? '#orgAssets' : undefined,
         icon: 'FabricFolderConfirm',
         key: 'keyOrgAssets',
       });
@@ -250,7 +251,7 @@ export class FilePicker extends React.Component<IFilePickerProps, IFilePickerSta
     if (!this.props.hideOneDriveTab) {
       links.push({
         name: "OneDrive",
-        url: '#onedrive',
+        url: addUrl ? '#onedrive' : undefined,
         key: 'keyOneDrive',
         icon: 'OneDrive',
       });
@@ -258,7 +259,7 @@ export class FilePicker extends React.Component<IFilePickerProps, IFilePickerSta
     if (!this.props.hideSiteFilesTab) {
       links.push({
         name: strings.SiteLinkLabel,
-        url: '#globe',
+        url: addUrl ? '#globe' : undefined,
         key: 'keySite',
         icon: 'Globe',
       });
@@ -266,7 +267,7 @@ export class FilePicker extends React.Component<IFilePickerProps, IFilePickerSta
     if (!this.props.hideLocalUploadTab) {
       links.push({
         name: strings.UploadLinkLabel,
-        url: '#upload',
+        url: addUrl ? '#upload' : undefined,
         key: 'keyUpload',
         icon: 'System'
       });
@@ -274,7 +275,7 @@ export class FilePicker extends React.Component<IFilePickerProps, IFilePickerSta
     if (!this.props.hideLinkUploadTab) {
       links.push({
         name: strings.FromLinkLinkLabel,
-        url: '#link',
+        url: addUrl ? '#link' : undefined,
         key: 'keyLink',
         icon: 'Link'
       });
diff --git a/src/controls/filePicker/IFilePickerProps.ts b/src/controls/filePicker/IFilePickerProps.ts
index bc985706c..0eb6d8759 100644
--- a/src/controls/filePicker/IFilePickerProps.ts
+++ b/src/controls/filePicker/IFilePickerProps.ts
@@ -101,4 +101,11 @@ export interface IFilePickerProps {
    * Specifies if LinkUploadTab should be hidden.
    */
   hideLinkUploadTab?: boolean;
+
+  /**
+   * Specifies if last active tab will be stored after the Upload panel has been closed.
+   * Note: the value of selected tab is stored in the queryString hash.
+   * @default true
+   */
+  storeLastActiveTab?: boolean;
 }
diff --git a/src/webparts/controlsTest/components/ControlsTest.tsx b/src/webparts/controlsTest/components/ControlsTest.tsx
index 5a7d32c96..80c9a9da2 100644
--- a/src/webparts/controlsTest/components/ControlsTest.tsx
+++ b/src/webparts/controlsTest/components/ControlsTest.tsx
@@ -537,7 +537,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
         <PeoplePicker context={this.props.context}
           titleText="People Picker (disabled)"
           disabled={true}
-          showtooltip={true} />
+          showtooltip={true}
+          defaultSelectedUsers={['aleksei.dovzhyk@sharepointalist.com']} />
 
         <DateTimePicker label="DateTime Picker (unspecified = date and time)" />