diff --git a/scripts/spdkcli.py b/scripts/spdkcli.py
index 7d5c6f865..7dcf76bc6 100755
--- a/scripts/spdkcli.py
+++ b/scripts/spdkcli.py
@@ -32,6 +32,7 @@ def main():
     :return:
     """
     spdk_shell = ConfigShell("~/.scripts")
+    spdk_shell.interactive = True
     add_quotes_to_shell(spdk_shell)
 
     parser = argparse.ArgumentParser(description="SPDK command line interface")
@@ -51,6 +52,7 @@ def main():
 
     if len(args.commands) > 0:
         try:
+            spdk_shell.interactive = False
             spdk_shell.run_cmdline(" ".join(args.commands))
         except Exception as e:
             sys.stderr.write("%s\n" % e)
diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py
index 0647662d1..eb81be235 100644
--- a/scripts/spdkcli/ui_node.py
+++ b/scripts/spdkcli/ui_node.py
@@ -43,13 +43,14 @@ class UINode(ConfigNode):
             self.shell.log.debug("Command %s succeeded." % command)
             return result
         finally:
-            if command in ["create", "delete", "delete_all", "add_initiator",
-                           "allow_any_host", "split_bdev", "add_lun",
-                           "add_pg_ig_maps", "remove_target", "add_secret",
-                           "destruct_split_bdev", "delete_pmem_pool",
-                           "create_pmem_pool", "delete_secret_all",
-                           "delete_initiator", "set_auth", "delete_secret",
-                           "delete_pg_ig_maps"]:
+            if self.shell.interactive and\
+                command in ["create", "delete", "delete_all", "add_initiator",
+                            "allow_any_host", "split_bdev", "add_lun",
+                            "add_pg_ig_maps", "remove_target", "add_secret",
+                            "destruct_split_bdev", "delete_pmem_pool",
+                            "create_pmem_pool", "delete_secret_all",
+                            "delete_initiator", "set_auth", "delete_secret",
+                            "delete_pg_ig_maps"]:
                 self.get_root().refresh()
                 self.refresh_node()