diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneMainComponent.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneMainComponent.java
index 6a651d8e..75e362d6 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneMainComponent.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneMainComponent.java
@@ -141,6 +141,7 @@ public class WorkPaneMainComponent extends VisibleComponent
 
         refreshClass = new JButton("Refresh");
         refreshClass.addActionListener((event)->{
+            refreshClass.setEnabled(false);
             Thread t = new Thread(() -> new WorkPaneRefresh(event).run(), "Refresh");
             t.start();
         });
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneRefresh.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneRefresh.java
index 2b1fb53b..fa519067 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneRefresh.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneRefresh.java
@@ -35,12 +35,6 @@ public class WorkPaneRefresh implements Runnable
 		if(tabComp == null)
 			return;
 		
-		if(src != null)
-		{
-			JButton finalSrc = src;
-			SwingUtilities.invokeLater(()-> finalSrc.setEnabled(false));
-		}
-		
 		BytecodeViewer.viewer.updateBusyStatus(true);
 		
 		if (tabComp instanceof ClassViewer)