diff --git a/src/components/experiment-files-viewer/experiment-files-viewer.css b/src/components/experiment-files-viewer/experiment-files-viewer.css
index 8147cd083d27ea7c8d8e5dda83633113b234d0a3..6469a06a9079ab846f365ea26fe8519b0bf045b4 100644
--- a/src/components/experiment-files-viewer/experiment-files-viewer.css
+++ b/src/components/experiment-files-viewer/experiment-files-viewer.css
@@ -84,6 +84,7 @@
 
 .experiment-li-buttons {
     justify-self: flex-end;
+    min-width: 76px;
 }
   
 .experiment-files {
diff --git a/src/components/experiment-files-viewer/experiment-files-viewer.js b/src/components/experiment-files-viewer/experiment-files-viewer.js
index 8687613a01e0dc75b33d55def4448a1e77890d7e..222c1600500a988be4b9c8fbc92ad449d1c465bb 100644
--- a/src/components/experiment-files-viewer/experiment-files-viewer.js
+++ b/src/components/experiment-files-viewer/experiment-files-viewer.js
@@ -174,7 +174,8 @@ export default class ExperimentFilesViewer extends React.Component {
                       {experiment.configuration.name}
                       <div className='experiment-li-buttons'>
                         <button className='nrp-btn'
-                          disabled={!RemoteExperimentFilesService.instance.localSyncDirectoryHandle}
+                          disabled={!RemoteExperimentFilesService.instance.localSyncDirectoryHandle
+                            || RemoteExperimentFilesService.instance.autoSync}
                           onClick={() => {
                             RemoteExperimentFilesService.instance.downloadExperimentToLocalFS(experiment);
                           }}
@@ -184,7 +185,8 @@ export default class ExperimentFilesViewer extends React.Component {
                         </button>
                         <button className='nrp-btn'
                           disabled={!experimentServerFiles
-                            || !RemoteExperimentFilesService.instance.mapFileInfos.has(experiment.uuid)}
+                            || !RemoteExperimentFilesService.instance.mapFileInfos.has(experiment.uuid)
+                            || RemoteExperimentFilesService.instance.autoSync}
                           onClick={() => {
                             RemoteExperimentFilesService.instance.uploadExperimentFromLocalFS(experiment);
                           }}
@@ -205,19 +207,22 @@ export default class ExperimentFilesViewer extends React.Component {
                 <div>Experiment Files</div>
                 <div className='grid-element-header-buttons'>
                   <button className='nrp-btn' title='Download selected'
-                    disabled={!this.state.selectedFilepaths || this.state.selectedFilepaths.length === 0}
+                    disabled={!this.state.selectedFilepaths || this.state.selectedFilepaths.length === 0
+                      || RemoteExperimentFilesService.instance.autoSync}
                     onClick={() =>
                       RemoteExperimentFilesService.instance.downloadExperimentFileList(this.state.selectedFilepaths)}>
                     <FaDownload />
                   </button>
                   <button className='nrp-btn' title='Upload selected'
-                    disabled={!this.state.selectedFilepaths || this.state.selectedFilepaths.length === 0}
+                    disabled={!this.state.selectedFilepaths || this.state.selectedFilepaths.length === 0
+                      || RemoteExperimentFilesService.instance.autoSync}
                     onClick={() =>
                       RemoteExperimentFilesService.instance.uploadExperimentFileList(this.state.selectedFilepaths)}>
                     <FaUpload />
                   </button>
                   <button className='nrp-btn' title='Delete selected'
-                    disabled={!this.state.selectedFilepaths || this.state.selectedFilepaths.length === 0}
+                    disabled={!this.state.selectedFilepaths || this.state.selectedFilepaths.length === 0
+                      || RemoteExperimentFilesService.instance.autoSync}
                     onClick={() =>
                       RemoteExperimentFilesService.instance.deleteExperimentFileList(this.state.selectedFilepaths)}>
                     <FaTrash />