diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 806bc72..fce2290 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -275,11 +275,13 @@ public class TestingList extends Panel {
     private void setButtonToStop(){
             this.jButtonRun.setToolTipText("Run selected tests");
             jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_play-64px.png")));        
+            this.jTable1.enableInputMethods(true);
     }
     
      private void setButtonToStart(){
             this.jButtonRun.setToolTipText("Stop tests");
             jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_stop-64px.png")));  
+            this.jTable1.enableInputMethods(false);
     }
     
     
@@ -412,6 +414,7 @@ public class TestingList extends Panel {
             }
             catch (Exception ex) {
                 SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
+                this.setButtonToStop();
             }
             finally{
                 return dsTestProperties;
@@ -545,7 +548,7 @@ public class TestingList extends Panel {
             File testsFolder = null;
             String sTestName;
             int iCounter = 0;
-        //search of devices and their tests
+            //search devices and their tests
             //Scan the list of devices
             File[] listOfFiles = folder.listFiles();
             for (File listOfFile : listOfFiles) {