diff --git a/sumo/src/netedit/GNEApplicationWindow.cpp b/sumo/src/netedit/GNEApplicationWindow.cpp
index 656257e8de6..343ee635e9e 100644
--- a/sumo/src/netedit/GNEApplicationWindow.cpp
+++ b/sumo/src/netedit/GNEApplicationWindow.cpp
@@ -796,9 +796,18 @@ GNEApplicationWindow::onCmdClearMsgWindow(FXObject*, FXSelector, void*) {
 
 long
 GNEApplicationWindow::onCmdAbout(FXObject*, FXSelector, void*) {
+    // write warning if netedit is running in testing mode
+    if ((myNet != NULL) && (myNet->getViewNet()->isTestingModeEnabled() == true)) {
+        WRITE_WARNING("Opening about dialog");
+    }
+    // create and open about dialog
     GNEDialog_About* about = new GNEDialog_About(this);
     about->create();
     about->show(PLACEMENT_OWNER);
+    // write warning if netedit is running in testing mode
+    if ((myNet != 0) && (myNet->getViewNet()->isTestingModeEnabled() == true)) {
+        WRITE_WARNING("Closed about dialog");
+    }
     return 1;
 }
 
@@ -1106,7 +1115,7 @@ GNEApplicationWindow::onCmdComputeJunctions(FXObject*, FXSelector, void*) {
 long 
 GNEApplicationWindow::onCmdComputeJunctionsVolatile(FXObject*, FXSelector, void*) {
     // write warning if netedit is running in testing mode
-    if (myNet->getViewNet()->isTestingModeEnabled() == true) {
+    if ((myNet != NULL) && (myNet->getViewNet()->isTestingModeEnabled() == true)) {
         WRITE_WARNING("Opening FXMessageBox of type 'question'");
     }
     // open question dialog box
@@ -1125,7 +1134,7 @@ GNEApplicationWindow::onCmdComputeJunctionsVolatile(FXObject*, FXSelector, void*
         myNet->computeEverything(this, true, true);
         updateControls();
         // write warning if netedit is running in testing mode
-        if (myNet->getViewNet()->isTestingModeEnabled() == true) {
+        if ((myNet != NULL) && (myNet->getViewNet()->isTestingModeEnabled() == true)) {
             WRITE_WARNING("Closed FXMessageBox of type 'question' with 'Yes'");
         }
         return 1;
diff --git a/sumo/src/netedit/GNEDialog_About.cpp b/sumo/src/netedit/GNEDialog_About.cpp
index 7c5e8855cad..88d53a5fe69 100644
--- a/sumo/src/netedit/GNEDialog_About.cpp
+++ b/sumo/src/netedit/GNEDialog_About.cpp
@@ -75,8 +75,11 @@ GNEDialog_About::GNEDialog_About(FXWindow* parent) :
     // centered ok-button
     FXHorizontalFrame* buttonFrame = new FXHorizontalFrame(this, GUIDesignHorizontalFrame);
     new FXHorizontalFrame(buttonFrame, GUIDesignAuxiliarHorizontalFrame);
-    new FXButton(buttonFrame, "OK\t\t", GUIIconSubSys::getIcon(ICON_ACCEPT), this, ID_ACCEPT, GUIDesignButtonOK);
+    FXButton* OKButton = new FXButton(buttonFrame, "&OK\t\t", GUIIconSubSys::getIcon(ICON_ACCEPT), this, ID_ACCEPT, GUIDesignButtonOK);
     new FXHorizontalFrame(buttonFrame, GUIDesignAuxiliarHorizontalFrame);
+    
+    // focus OK button
+    OKButton->setFocus();
 }